Merge branch 'pm-cpufreq' into pm-cpu