Merge branches 'pm-cpufreq-fixes' and 'intel_pstate-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Mar 2017 23:45:09 +0000 (00:45 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Mar 2017 23:45:09 +0000 (00:45 +0100)
* pm-cpufreq-fixes:
  cpufreq: Fix and clean up show_cpuinfo_cur_freq()

* intel_pstate-fixes:
  cpufreq: intel_pstate: Avoid percentages in limits-related computations
  cpufreq: intel_pstate: Correct frequency setting in the HWP mode
  cpufreq: intel_pstate: Update pid_params.sample_rate_ns in pid_param_set()


Trivial merge