Merge back earlier cpufreq material for v5.1.