Merge branch 'pm-cpufreq'