Merge branch 'x86/x2apic' into irq/sparseirq
authorThomas Gleixner <tglx@linutronix.de>
Tue, 12 Oct 2010 14:39:44 +0000 (16:39 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 12 Oct 2010 14:39:53 +0000 (16:39 +0200)
commit8ffcfa4e2d96342180e02dfe1230b97778c52d72
tree77255a0235022444fe958ab1092fb352e6222b72
parentb683de2b3cb17bb10fa6fd4af614dc75b5749fe0
parentfa47f7e52874683a9659df2f1f143105f676dc0f
Merge branch 'x86/x2apic' into irq/sparseirq

Reason: Avoid conflicts with the x2apic modifications

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/apic/io_apic.c