Merge back earlier cpufreq material.