Merge branch 'linus' into x86/apic-cleanups
authorIngo Molnar <mingo@elte.hu>
Fri, 7 Jan 2011 13:14:15 +0000 (14:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 7 Jan 2011 13:14:15 +0000 (14:14 +0100)
commit1c2a48cf65580a276552151eb8f78d78c55b828e
tree68ed0628a276b33cb5aa0ad4899c1afe0a33a69d
parent0aa002fe602939370e9476e5ec32b562000a0425
parentcb600d2f83c854ec3d6660063e4466431999489b
Merge branch 'linus' into x86/apic-cleanups

Conflicts:
arch/x86/include/asm/io_apic.h

Merge reason: Resolve the conflict, update to a more recent -rc base

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/io_apic.c
arch/x86/platform/sfi/sfi.c