original_kernel/arch/x86/mach-visws
Ingo Molnar 3de352bbd8 Merge branch 'x86/mpparse' into x86/devel
Conflicts:

	arch/x86/Kconfig
	arch/x86/kernel/io_apic_32.c
	arch/x86/kernel/setup_64.c
	arch/x86/mm/init_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-08 11:14:58 +02:00
..
Makefile
mpparse.c
reboot.c
setup.c x86: rename two e820 related functions 2008-07-08 10:37:01 +02:00
traps.c
visws_apic.c