From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 6 Feb 2017 13:52:10 +0000 (+0100)
Subject: Merge branches 'pm-core-fixes' and 'pm-cpufreq-fixes'
X-Git-Tag: v4.10-rc8~32^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cbf304e420da96992eae50bb6d51035681340ab8;p=linux.git

Merge branches 'pm-core-fixes' and 'pm-cpufreq-fixes'

* pm-core-fixes:
  PM / runtime: Avoid false-positive warnings from might_sleep_if()

* pm-cpufreq-fixes:
  cpufreq: intel_pstate: Disable energy efficiency optimization
  cpufreq: brcmstb-avs-cpufreq: properly retrieve P-state upon suspend
  cpufreq: brcmstb-avs-cpufreq: extend sysfs entry brcm_avs_pmap
---

cbf304e420da96992eae50bb6d51035681340ab8