Merge tag 'omap-for-v3.9/pm-signed' into omap-for-v3.9/pm-wfi-take2