Merge branch 'omap/soc' into next/soc