git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3de352b 46f68e1)
Merge branch 'x86/numa' into x86/devel
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 09:59:23 +0000 (11:59 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 09:59:23 +0000 (11:59 +0200)
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>

Trivial merge
Pandora Kernel Repository