Merge branch 'x86/apic' into irq/numa
Ingo Molnar [Tue, 12 May 2009 10:17:30 +0000 (12:17 +0200)]
Merge reason: both topics modify the APIC code but were able to do it in
              parallel so far. An upcoming patch generates a conflict so
              merge them to avoid the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
arch/x86/kernel/apic/io_apic.c
drivers/pci/htirq.c
kernel/irq/handle.c

Simple merge
Simple merge
Simple merge