Merge back earlier 'pm-cpufreq' material.