From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 21 Apr 2016 18:57:46 +0000 (+0200)
Subject: Merge branch 'pm-cpufreq-fixes'
X-Git-Tag: v4.6-rc5~18^2
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=395da1259ac3e3fdc70636a854c993ddb76c6169

Merge branch 'pm-cpufreq-fixes'

* pm-cpufreq-fixes:
  cpufreq: Abort cpufreq_update_current_freq() for cpufreq_suspended set
  intel_pstate: Avoid getting stuck in high P-states when idle
---

395da1259ac3e3fdc70636a854c993ddb76c6169