Ingo Molnar 2b4fa851b2 Merge branch 'x86/numa' into x86/devel ... Conflicts: arch/x86/Kconfig arch/x86/kernel/e820.c arch/x86/kernel/efi_64.c arch/x86/kernel/mpparse.c arch/x86/kernel/setup.c arch/x86/kernel/setup_32.c arch/x86/mm/init_64.c include/asm-x86/proto.h Signed-off-by: Ingo Molnar <mingo@elte.hu>		2008-07-08 11:59:23 +02:00
..
Makefile	…
Makefile_32	Merge branch 'x86/mpparse' into x86/devel	2008-07-08 11:14:58 +02:00
Makefile_64	…
acpi.c	Merge branch 'x86/numa' into x86/devel	2008-07-08 11:59:23 +02:00
amd_bus.c	Merge branch 'x86/mpparse' into x86/devel	2008-07-08 11:14:58 +02:00
common.c	…
direct.c	…
early.c	…
fixup.c	…
i386.c	…
init.c	…
irq.c	…
legacy.c	…
mmconfig-shared.c	…
mmconfig_32.c	…
mmconfig_64.c	…
mp_bus_to_node.c	…
numa.c	…
olpc.c	…
pcbios.c	…
pci.h	…
visws.c	…