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

Merge branch 'x86/mpparse' into x86/devel

Conflicts:

	arch/x86/Kconfig
	arch/x86/kernel/io_apic_32.c
	arch/x86/kernel/setup_64.c
	arch/x86/mm/init_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce
Reading git-diff-tree failed