]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-sleep' and 'pm-domains'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 12 Apr 2015 22:37:13 +0000 (00:37 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 12 Apr 2015 22:37:13 +0000 (00:37 +0200)
commit12c6f16dc27bba04cec6cf9b5e878c0e73da423c
tree104d0c7b4677f4db0f913f11a05a1bc905059774
parent07a2919e653057e5443a1f0c37752fe83596350a
parent79f45da45621a76652316dab0af5672f0715395e
parentb6c4e47c89b39acd406bb11ddc4b6f5cd6a55dba
Merge branches 'pm-sleep' and 'pm-domains'

* pm-sleep:
  PM / watchdog: iTCO: stop watchdog during system suspend
  PM / sleep: add pm-trace support for suspending phase
  PM / sleep: add configurable delay for pm_test

* pm-domains:
  PM / domains: avoid potential oops in pm_genpd_remove_device()
  PM / domains: factor out code to get the generic PM domain from a struct device
  PM / domains: quieten down generic pm domains
  PM / Domains: Sync runtime PM status with genpd after probe
  driver core / PM: Add PM domain callbacks for device setup/cleanup
  MAINTAINERS: add entry for Generic PM domains (genpd)
MAINTAINERS