Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git] / init / Kconfig
diff --cc init/Kconfig
Simple merge