Ingo Molnar 4420471f14 Merge branch 'x86/apic' into irq/numa ...

Conflicts:
	arch/x86/kernel/apic/io_apic.c

Merge reason: non-trivial interaction between ongoing work in io_apic.c
              and the NUMA migration feature in the irq tree.

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

2009-05-01 19:02:50 +02:00

15 KiB

Raw Blame History

View Raw