Merge commit 'v2.6.29' into x86/setup-lzma

author Ingo Molnar <mingo@elte.hu>

Thu, 26 Mar 2009 17:49:48 +0000 (18:49 +0100)

committer Ingo Molnar <mingo@elte.hu>

Thu, 26 Mar 2009 17:49:48 +0000 (18:49 +0100)
author Ingo Molnar <mingo@elte.hu>
Thu, 26 Mar 2009 17:49:48 +0000 (18:49 +0100)
committer Ingo Molnar <mingo@elte.hu>
Thu, 26 Mar 2009 17:49:48 +0000 (18:49 +0100)
diff --cc Documentation/x86/boot.txt
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc init/Kconfig
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Thu, 26 Mar 2009 17:49:48 +0000 (18:49 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 26 Mar 2009 17:49:48 +0000 (18:49 +0100)
		1	2
Documentation/x86/boot.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history