Merge branches 'pm-core-fixes' and 'pm-cpufreq-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Feb 2017 13:52:10 +0000 (14:52 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Feb 2017 13:52:10 +0000 (14:52 +0100)
commitcbf304e420da96992eae50bb6d51035681340ab8
tree76f729910e5fdca468464004f94b70b6b3cca81e
parentd5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c
parenta9306a63631493afc75893a4ac405d4e1cbae6aa
parent6e978b22efa1db9f6e71b24440b5f1d93e968ee3
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
drivers/cpufreq/intel_pstate.c