Merge branch 'omap-for-v3.9/pm-fix' into omap-for-v3.9/pm-wfi-take2