Merge branch 'pm-cpufreq-sched'