]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-core' and 'pm-domains'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 16 May 2016 12:31:29 +0000 (14:31 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 16 May 2016 12:31:29 +0000 (14:31 +0200)
commited69407c4c84b235988d3acff122895c5a9db00a
treeb3c411156fe5111a30a0eca3c9a3657323df0351
parentef7c0274bc07add0854ab0ae4f3246f6a220b26e
parent5fd4d1af4a212afd42523700ec098698a04d813e
parent7371bf99061690f66bc2738b8e740c8df5b1db6e
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