Ingo Molnar 453c1404c5 Merge branch 'x86/apic' into x86/x2apic ... Conflicts: arch/x86/kernel/paravirt.c arch/x86/kernel/smpboot.c arch/x86/kernel/vmi_32.c arch/x86/lguest/boot.c arch/x86/xen/enlighten.c include/asm-x86/apic.h include/asm-x86/paravirt.h Signed-off-by: Ingo Molnar <mingo@elte.hu>		2008-07-18 23:00:05 +02:00
..
boot.c	Merge branch 'x86/apic' into x86/x2apic	2008-07-18 23:00:05 +02:00
i386_head.S	lguest: comment documentation update.	2008-03-28 11:05:54 +11:00
Kconfig	x86, VisWS: turn into generic arch, eliminate Kconfig specials	2008-07-10 18:55:47 +02:00
Makefile