]> 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)
commit0f13704db881dd3cb2812e6f9f8d48e2d8e84459
treeb3c411156fe5111a30a0eca3c9a3657323df0351
parenta54276302a25e265965e571f56c368b661546494
parentdb236bce732f58bb45edd7fd78037a9000bff5ac
parente52cb457964d859bd563086328d48977844acd32
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