From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 17 Mar 2017 23:45:09 +0000 (+0100)
Subject: Merge branches 'pm-cpufreq-fixes' and 'intel_pstate-fixes'
X-Git-Tag: v4.11-rc3~8^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8b766e05d8ec80b6b1daa2675509adcab6519038;p=users%2Fjedix%2Flinux-maple.git

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

* 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()
---

8b766e05d8ec80b6b1daa2675509adcab6519038