Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/pm-part2