Merge commit 'v2.6.29' into x86/setup-lzma
Ingo Molnar [Thu, 26 Mar 2009 17:49:48 +0000 (18:49 +0100)]
1  2 
Documentation/x86/boot.txt
arch/x86/Kconfig
init/Kconfig

Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge