cpufreq: ondemand: upstream merge fix