Merge back earlier cpufreq material for v4.1.