Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Jan 2019 09:09:51 +0000 (10:09 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Jan 2019 09:09:51 +0000 (10:09 +0100)
commit343e60e52a3a093bb7baeca441789724fcac4bb5
tree22dd49e3429016fef61ec51f11aba6120766ef6d
parentca27e4cd0bdd87e33fda38e6e3d18d36d54356d4
parent7604bf0920985c9280c8b24e2f0c3e4ed47f502f
parent0e141d1c65c1dd31c914eb2e11651adcc1a15912
parent6e863844ad6effecac92a67a43b8467a8c2e129f
Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-sleep'

* pm-cpuidle:
  doc: trace: fix reference to cpuidle documentation file
  cpuidle / Documentation: Update cpuidle MAINTAINERS entry

* pm-cpufreq:
  cpufreq: scmi: Fix frequency invariance in slow path
  cpufreq: check if policy is inactive early in __cpufreq_get()
  cpufreq: scpi/scmi: Fix freeing of dynamic OPPs
  cpufreq / Documentation: Update cpufreq MAINTAINERS entry

* pm-sleep:
  PM: sleep: call devfreq suspend/resume
MAINTAINERS
drivers/cpufreq/cpufreq.c