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
..
2008-07-04 10:40:05 -07:00
2008-05-20 16:44:43 +02:00
2008-07-05 20:30:51 +02:00
2008-06-19 00:12:36 +02:00
2008-05-20 13:31:55 -07:00
2008-05-21 16:56:00 -07:00
2008-06-30 15:43:52 -04:00
2008-07-04 10:40:05 -07:00
2008-07-04 10:40:05 -07:00
2008-07-04 10:40:08 -07:00
2008-05-20 13:31:55 -07:00