Merge back earlier cpufreq material for 4.20.