Merge branch 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Jan 2017 13:34:52 +0000 (14:34 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Jan 2017 13:34:52 +0000 (14:34 +0100)
commit3baad65546b0d6b2695b1de384130125495bc545
tree9c8821da9cd82fb3c13c156a26990206f3397603
parent0c744ea4f77d72b3dcebb7a8f2684633ec79be88
parente11b6293a8fcd3f29376808910f49bd82f72b69a
Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: dt: Add support for APM X-Gene 2
  cpufreq: intel_pstate: Always keep all limits settings in sync
  cpufreq: intel_pstate: Use locking in intel_cpufreq_verify_policy()
  cpufreq: intel_pstate: Use locking in intel_pstate_resume()
  cpufreq: intel_pstate: Do not expose PID parameters in passive mode
drivers/cpufreq/intel_pstate.c