Merge branches 'pm-cpufreq-fixes' and 'pm-sleep-fixes'