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