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

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