Merge commit 'pm-fixes-for-3.3-rc3' into pm-qos

New material in the pm-qos branch depends on recent power management
fixes.