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