author | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 21 Oct 2010 20:54:05 +0000 (13:54 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 21 Oct 2010 20:54:05 +0000 (13:54 -0700) |
* 'x86-x2apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, x2apic: Simplify apic init in SMP and UP builds
x86, intr-remap: Remove IRTE setup duplicate code
x86, intr-remap: Set redirection hint in the IRTE
x86, x2apic: Simplify apic init in SMP and UP builds
x86, intr-remap: Remove IRTE setup duplicate code
x86, intr-remap: Set redirection hint in the IRTE
1 | 2 | |||
---|---|---|---|---|
arch/x86/kernel/apic/io_apic.c | patch | | diff1 | | diff2 | | blob | history |
arch/x86/kernel/smpboot.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge
diff --cc arch/x86/kernel/smpboot.c
Simple merge