From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 8 Jul 2008 09:59:23 +0000 (+0200)
Subject: Merge branch 'x86/numa' into x86/devel
X-Git-Tag: v2.6.27-rc1~1106^2~246
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b4fa851b2f06fdb04cac808b57324f5e51e1578;p=pandora-kernel.git

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>
---

2b4fa851b2f06fdb04cac808b57324f5e51e1578
Reading git-diff-tree failed