| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 26 Mar 2011 00:51:51 +0000 (17:51 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 26 Mar 2011 00:51:51 +0000 (17:51 -0700) | ||
| commit | 26ff6801f751cd47e44c2e9507ec08b447f2d2b9 | |
| tree | a6bd5286e4a1ab4f96847300cb8d961ada62a231 | tree | snapshot (tar.xz tar.gz zip) |
| parent | ffbf0ab1a648b867ce953cc43557090f679bb9c1 | commit | diff |
| parent | 07611dbda5ccbd9a628f29686d62bafdd007db7b | commit | diff |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional
x86: DT: Fix return condition in irq_create_of_mapping()
x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional
x86: DT: Fix return condition in irq_create_of_mapping()
x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context