H. Peter Anvin 48b1fddbb1 Merge branch 'irq/numa' into x86/mce3 ... Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa and modified in x86/mce3; this merge resolves the conflict. Conflicts: arch/x86/kernel/irqinit.c Signed-off-by: H. Peter Anvin <hpa@zytor.com>		2009-06-01 15:25:31 -07:00
..
asm	Merge branch 'irq/numa' into x86/mce3	2009-06-01 15:25:31 -07:00