Ingo Molnar 6cda3eb62e Merge branch 'x86/apic' into irq/numa ... 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>		2009-05-12 12:17:36 +02:00
..
asm	Merge branch 'x86/apic' into irq/numa	2009-05-12 12:17:36 +02:00