Merge branch 'sh/cpufreq' into sh-latest