Merge remote branch 'origin/x86/apic' into x86/mrst
authorH. Peter Anvin <hpa@zytor.com>
Tue, 23 Feb 2010 00:25:18 +0000 (16:25 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 23 Feb 2010 00:25:18 +0000 (16:25 -0800)
commit54b56170e4517e9606b245c3f805fc96baa059f0
tree9f8750ef972b4a7fdce530889dcbaf2a8b5b0d05
parent1f91233c26fd5f7d6525fd29b95e4b50ca7a3e88
parentd02e30c31c57683a66ed68a1bcff900ca78f6d56
Merge remote branch 'origin/x86/apic' into x86/mrst

Conflicts:
arch/x86/kernel/apic/io_apic.c
arch/x86/include/asm/i8259.h
arch/x86/include/asm/io_apic.h
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/apic/nmi.c
arch/x86/kernel/i8259.c
arch/x86/kernel/irqinit.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/visws_quirks.c