Merge branch 'x86/apic' into x86/irq
authorThomas Gleixner <tglx@linutronix.de>
Sat, 12 Mar 2011 12:22:22 +0000 (13:22 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 12 Mar 2011 12:22:28 +0000 (13:22 +0100)
commitcfe08bba1e0017d94a8f738a195d3a2b479327e3
tree4546939fd9fbddc978b6eaa0299b03177e9e643b
parent58bff947e2d164c7e5cbf7f485e4b3d4884befeb
parentabb0052289e58140d933b29491f59e4be0a19727
Merge branch 'x86/apic' into x86/irq

Reason: Update to latest genirq code conflicts with pending apic
changes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>