Merge branch 'pm-cpufreq-governor' into pm-cpufreq