From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Jan 2018 01:54:45 +0000 (+0100)
Subject: Merge branches 'pm-domains', 'pm-kconfig', 'pm-cpuidle' and 'powercap'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f9b736f64aae9252a1f71fcf64c7aeee4f5d0e29;p=linux.git

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

f9b736f64aae9252a1f71fcf64c7aeee4f5d0e29