Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs
[pandora-kernel.git] / arch / Kconfig
diff --cc arch/Kconfig
Simple merge