Merge back earlier cpufreq changes for v4.8.