Merge branch 'cpufreq-macros' into pm-cpufreq