diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-01-11 10:09:51 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-01-11 10:09:51 +0100 |
commit | 343e60e52a3a093bb7baeca441789724fcac4bb5 (patch) | |
tree | 22dd49e3429016fef61ec51f11aba6120766ef6d /drivers/base | |
parent | ca27e4cd0bdd87e33fda38e6e3d18d36d54356d4 (diff) | |
parent | 7604bf0920985c9280c8b24e2f0c3e4ed47f502f (diff) | |
parent | 0e141d1c65c1dd31c914eb2e11651adcc1a15912 (diff) | |
parent | 6e863844ad6effecac92a67a43b8467a8c2e129f (diff) | |
download | linux-stable-343e60e52a3a093bb7baeca441789724fcac4bb5.tar.gz linux-stable-343e60e52a3a093bb7baeca441789724fcac4bb5.tar.bz2 linux-stable-343e60e52a3a093bb7baeca441789724fcac4bb5.zip |
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