diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-16 15:31:29 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-16 15:31:29 +0300 |
| commit | aa24781b1cbd62cc7e7d2f1964bfd5727388bf3e (patch) | |
| tree | b3c411156fe5111a30a0eca3c9a3657323df0351 /drivers | |
| parent | 7777c2785b4ae5bfbef1c9f7dd4a08660541cb45 (diff) | |
| parent | fba1fbf56383073d286e6e3657bff36ee0f410e8 (diff) | |
| parent | 164a2159a2d6789bc7e3c4b126dde7f3ce865992 (diff) | |
| download | linux-aa24781b1cbd62cc7e7d2f1964bfd5727388bf3e.tar.xz | |
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