Merge branches 'x86-efi-for-linus', 'x86-gart-for-linus', 'x86-irq-for-linus'...
Merge branches 'x86-efi-for-linus', 'x86-gart-for-linus', 'x86-irq-for-linus' and 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, efi: Ensure that the entirity of a region is mapped x86, efi: Pass a minimal map to SetVirtualAddressMap() x86, efi: Merge contiguous memory regions of the same type and attribute x86, efi: Consolidate EFI nx control x86, efi: Remove virtual-mode SetVirtualAddressMap call * 'x86-gart-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, gart: Don't enforce GART aperture lower-bound by alignment * 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Don't unmask disabled irqs when migrating them x86: Skip migrating IRQF_PER_CPU irqs in fixup_irqs() * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, mce: Drop the default decoding notifier x86, MCE: Do not taint when handling correctable errors
No related branches found
No related tags found
Showing
- arch/x86/include/asm/efi.h 1 addition, 0 deletionsarch/x86/include/asm/efi.h
- arch/x86/include/asm/mce.h 0 additions, 2 deletionsarch/x86/include/asm/mce.h
- arch/x86/kernel/aperture_64.c 19 additions, 15 deletionsarch/x86/kernel/aperture_64.c
- arch/x86/kernel/cpu/mcheck/mce.c 7 additions, 18 deletionsarch/x86/kernel/cpu/mcheck/mce.c
- arch/x86/kernel/cpu/mcheck/therm_throt.c 0 additions, 3 deletionsarch/x86/kernel/cpu/mcheck/therm_throt.c
- arch/x86/kernel/irq.c 3 additions, 2 deletionsarch/x86/kernel/irq.c
- arch/x86/platform/efi/efi.c 57 additions, 21 deletionsarch/x86/platform/efi/efi.c
- arch/x86/platform/efi/efi_64.c 9 additions, 25 deletionsarch/x86/platform/efi/efi_64.c
Loading
Please register or sign in to comment