Merge branch 'omap/voltage' into next/pm