Merge branch 'x86/apic' into x86/platform
authorThomas Gleixner <tglx@linutronix.de>
Wed, 23 Feb 2011 19:00:55 +0000 (20:00 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 23 Feb 2011 19:01:01 +0000 (20:01 +0100)
Reason: Devicetree based ioapic setup depends on the apic changes.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1  2 
arch/x86/Kconfig

Simple merge