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