Merge branch 'pm-fixes' into pm-cpufreq

A subsequent commit depends on the 'pm-fixes' commits.