Merge branch 'omap4-i2c-init' into omap-for-linus
[pandora-kernel.git] / arch / Kconfig
diff --cc arch/Kconfig
Simple merge