commit f9b736f64aae9252a1f71fcf64c7aeee4f5d0e29
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> Thu Jan 18 02:54:45 2018 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> Thu Jan 18 02:54:45 2018 +0100
tree 3070bd577e60acd18feae21b2147ffcd8550fd2e
parent f31c376025b5b295908d4b8ec74811be7d7e15f8
parent 17218e0092f8c7b7edce7ff08c8b23212eac7271
parent a248efb3d634854dfcf43a165003597542e90d11
parent 3cfd68b5ba8737d28bfcf9b6487ea4d9216b8504
parent 01857cf7748aef41c20987526d4c12f12b2f04ff

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()