| commit | 2b4fa851b2f06fdb04cac808b57324f5e51e1578 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Jul 08 11:59:23 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Jul 08 11:59:23 2008 +0200 |
| tree | 97db3ad5adda7683923630982f68b8b52c86e790 | |
| parent | 3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce [diff] | |
| parent | 46f68e1c6b04a04772e828ff3bcd07ed708805c2 [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>