Merge branches 'pm-cpuidle' and 'pm-cpufreq'