Merge branches 'pm-cpufreq' and 'acpi-cppc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 27 Nov 2015 15:23:59 +0000 (16:23 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 27 Nov 2015 15:23:59 +0000 (16:23 +0100)
* pm-cpufreq:
  intel_pstate: Fix "performance" mode behavior with HWP enabled
  cpufreq: SCPI: Depend on SCPI clk driver
  cpufreq: intel_pstate: Fix limits->max_perf rounding error
  cpufreq: intel_pstate: Fix limits->max_policy_pct rounding error
  cpufreq: Always remove sysfs cpuX/cpufreq link on ->remove_dev()

* acpi-cppc:
  cpufreq: CPPC: Initialize and check CPUFreq CPU co-ord type correctly


Trivial merge