Merge branch 'pm-cpufreq-fixes'