Merge branches 'pm-devfreq' and 'pm-cpufreq'