Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git] / init / Kconfig
diff --cc init/Kconfig
Simple merge