diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-18 02:54:45 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-18 02:54:45 +0100 |
commit | f9b736f64aae9252a1f71fcf64c7aeee4f5d0e29 (patch) | |
tree | 3070bd577e60acd18feae21b2147ffcd8550fd2e /drivers/bus | |
parent | Merge branch 'pm-cpufreq' (diff) | |
parent | PM / genpd: Stop/start devices without pm_runtime_force_suspend/resume() (diff) | |
parent | bus: simple-pm-bus: convert bool SIMPLE_PM_BUS to tristate (diff) | |
parent | cpuidle: Avoid NULL argument in cpuidle_switch_governor() (diff) | |
parent | powercap: intel_rapl: Fix trailing semicolon (diff) | |
download | linux-f9b736f64aae9252a1f71fcf64c7aeee4f5d0e29.tar.xz linux-f9b736f64aae9252a1f71fcf64c7aeee4f5d0e29.zip |
Merge branches 'pm-domains', 'pm-kconfig', 'pm-cpuidle' and 'powercap'
* pm-domains:
PM / genpd: Stop/start devices without pm_runtime_force_suspend/resume()
PM / domains: Don't skip driver's ->suspend|resume_noirq() callbacks
PM / Domains: Remove obsolete "samsung,power-domain" check
* pm-kconfig:
bus: simple-pm-bus: convert bool SIMPLE_PM_BUS to tristate
PM: Provide a config snippet for disabling PM
* pm-cpuidle:
cpuidle: Avoid NULL argument in cpuidle_switch_governor()
* powercap:
powercap: intel_rapl: Fix trailing semicolon
powercap: add suspend and resume mechanism for SOC power limit
powercap: Simplify powercap_init()