Merge branch 'pm-cpufreq-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 21 Apr 2016 18:57:46 +0000 (20:57 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 21 Apr 2016 18:57:46 +0000 (20:57 +0200)
* pm-cpufreq-fixes:
  cpufreq: Abort cpufreq_update_current_freq() for cpufreq_suspended set
  intel_pstate: Avoid getting stuck in high P-states when idle


Trivial merge