Merge branch 'pm-cpufreq-Kconfig' into pm-cpufreq