Merge branch 'pm-cpufreq-ondemand' into pm-cpufreq