Merge branch 'pm-cpufreq' into fixes