diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-11 10:53:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-11 10:53:37 -0700 |
| commit | c120ec12e216225f7536cc1b924fe428ff64b5bd (patch) | |
| tree | 112620485e418538cda85d06ce245ea3ebe39974 /drivers/powercap/intel_rapl_common.c | |
| parent | aa5c3a2911e6d5feaf0c3c7af5bbc652f129d8b2 (diff) | |
| parent | 0c7689830e907668288a1a1da84dca66dbdb4728 (diff) | |
| download | linux-c120ec12e216225f7536cc1b924fe428ff64b5bd.tar.bz2 | |
Merge tag 'x86-urgent-2020-10-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Two fixes:
- Fix a (hopefully final) IRQ state tracking bug vs MCE handling
- Fix a documentation link"
* tag 'x86-urgent-2020-10-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Documentation/x86: Fix incorrect references to zero-page.txt
x86/mce: Use idtentry_nmi_enter/exit()
Diffstat (limited to 'drivers/powercap/intel_rapl_common.c')
0 files changed, 0 insertions, 0 deletions