Merge branch 'linus' into x86/cleanups

author Ingo Molnar <mingo@elte.hu>

Sat, 8 Nov 2008 19:23:02 +0000 (20:23 +0100)

committer Ingo Molnar <mingo@elte.hu>

Sat, 8 Nov 2008 19:23:02 +0000 (20:23 +0100)
author Ingo Molnar <mingo@elte.hu>
Sat, 8 Nov 2008 19:23:02 +0000 (20:23 +0100)
committer Ingo Molnar <mingo@elte.hu>
Sat, 8 Nov 2008 19:23:02 +0000 (20:23 +0100)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/mm/init_32.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Sat, 8 Nov 2008 19:23:02 +0000 (20:23 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Sat, 8 Nov 2008 19:23:02 +0000 (20:23 +0100)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	patch \|	diff1 \|	diff2 \|	blob \| history