Merge branch 'next/fixes-non-critical' into next/drivers
[pandora-kernel.git] / arch / arm / Kconfig
Simple merge