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)
commitf28a1b0df7adcc981e5ce5a5daf3d638dd019c0e
treead6ec539350520f4f6a81f233bf44bd2bacfe3a3
parent584ee3dcb1d6232857c1e38bb28d9f6bf0ec89f5
parent9dc17917733f5a53ef970ac95a48d2dfb7dc7202
Merge branches 'pm-cpufreq' and 'acpi-cppc'

* 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