Merge branch 'cpufreq' into dev