]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit2b4fa851b2f06fdb04cac808b57324f5e51e1578
tree97db3ad5adda7683923630982f68b8b52c86e790tree | snapshot
parent3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8cecommit | diff
parent46f68e1c6b04a04772e828ff3bcd07ed708805c2commit | diff
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>
15 files changed:
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/Kconfig.debug diff1 | diff2 | blob | history
arch/x86/kernel/apic_32.c diff1 | diff2 | blob | history
arch/x86/kernel/apic_64.c diff1 | diff2 | blob | history
arch/x86/kernel/head64.c diff1 | diff2 | blob | history
arch/x86/kernel/nmi_64.c diff1 | diff2 | blob | history
arch/x86/kernel/setup.c diff1 | diff2 | blob | history
arch/x86/kernel/setup_32.c diff1 | diff2 | blob | history
arch/x86/kernel/setup_64.c diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c diff1 | diff2 | blob | history
arch/x86/mm/numa_64.c diff1 | diff2 | blob | history
arch/x86/mm/srat_64.c diff1 | diff2 | blob | history
arch/x86/pci/acpi.c diff1 | diff2 | blob | history
include/asm-x86/smp.h diff1 | diff2 | blob | history
include/linux/mm.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.