Merge branches 'pm-cpufreq-sched' and 'pm-opp'