Ingo Molnar 9d45cf9e36 Merge branch 'x86/urgent' into x86/apic ... Conflicts: arch/x86/mach-default/setup.c Semantic merge: arch/x86/kernel/irqinit_32.c Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-02-05 22:30:01 +01:00
..
Makefile
setup.c	Merge branch 'x86/urgent' into x86/apic	2009-02-05 22:30:01 +01:00
voyager_basic.c
voyager_cat.c
voyager_smp.c	Merge branch 'x86/urgent' into x86/apic	2009-02-05 22:30:01 +01:00
voyager_thread.c