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