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