Merge branches 'pm-cpufreq-fixes' and 'intel_pstate-fixes'