Ingo Molnar bf8bd66d05 Merge branch 'x86/apic' into x86/irq ... Conflicts: arch/x86/kernel/apic.c		2008-12-23 16:24:15 +01:00
..
asm	Merge branch 'x86/apic' into x86/irq	2008-12-23 16:24:15 +01:00