diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 01:03:56 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 01:03:56 (GMT) |
| commit | ac2941f59a38eeb535e1f227a8f90d7fe6b7828b (patch) | |
| tree | 142bda3d1794da9c45e1327c30c7e5f6c5868fac /arch/mips/fw | |
| parent | 016281880439a8665ecf37514865742da58131d4 (diff) | |
| parent | 935a638241b0658b9749edd060f972575f9d4a78 (diff) | |
| parent | c387aa3a1a910ce00b86f3a85082d24f144db256 (diff) | |
| parent | 983bbf1af0664b78689612b247acb514300f62c7 (diff) | |
| parent | dffa4b2f62ff28c982144c7033001b1ece4d3532 (diff) | |
| download | linux-fsl-qoriq-ac2941f59a38eeb535e1f227a8f90d7fe6b7828b.tar.xz | |
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