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)
commitcb4cfd568c1181501419b89d916e8523107c0106
tree9916f66509a29ed0f211cb2b6103ff1e76424c19
parent939d578ecc62b07efeb186576ab190fe0b766501
parentabb0052289e58140d933b29491f59e4be0a19727
Merge branch 'x86/apic' into x86/platform

Reason: Devicetree based ioapic setup depends on the apic changes.

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