From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 16 May 2016 12:31:29 +0000 (+0200)
Subject: Merge branches 'pm-core' and 'pm-domains'
X-Git-Tag: MMI-PSA29.97-13-9~7951^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aa24781b1cbd62cc7e7d2f1964bfd5727388bf3e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branches 'pm-core' and 'pm-domains'

* pm-core:
  PM / sleep: Drop unused `info' variable
  PM / Runtime: Move ignore_children flag under CONFIG_PM
  PM / Runtime: Fix error path in pm_runtime_force_resume()

* pm-domains:
  PM / Domains: Drop unnecessary wakeup code from pm_genpd_prepare()
  PM / Domains: Remove redundant pm_runtime_get|put*() in pm_genpd_prepare()
  PM / Domains: Remove ->save|restore_state() callbacks
  PM / Domains: Rename pm_genpd_runtime_suspend|resume()
  PM / Domains: Rename stop_ok to suspend_ok for the genpd governor
---

aa24781b1cbd62cc7e7d2f1964bfd5727388bf3e