diff options
| author | Rafael J. Wysocki <[email protected]> | 2016-05-16 12:31:29 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2016-05-16 12:31:29 +0000 |
| commit | aa24781b1cbd62cc7e7d2f1964bfd5727388bf3e (patch) | |
| tree | b3c411156fe5111a30a0eca3c9a3657323df0351 /fs/jbd2/commit.c | |
| parent | Merge branch 'pm-devfreq' (diff) | |
| parent | PM / sleep: Drop unused `info' variable (diff) | |
| parent | PM / Domains: Drop unnecessary wakeup code from pm_genpd_prepare() (diff) | |
| download | kernel-aa24781b1cbd62cc7e7d2f1964bfd5727388bf3e.tar.gz kernel-aa24781b1cbd62cc7e7d2f1964bfd5727388bf3e.zip | |
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