Merge branch 'omap/prcm' into next/pm