diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-04-13 00:37:13 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-04-13 00:37:13 +0200 |
| commit | 0fe0952b2191b19493adb847eb40c6f88e1caeaf (patch) | |
| tree | 104d0c7b4677f4db0f913f11a05a1bc905059774 /drivers/base | |
| parent | 419a48ce8576e2617130bb6b6e20f824ddde1033 (diff) | |
| parent | be770021011f00bd6220c87876292053221ca5f1 (diff) | |
| parent | df6a0d6f633d684ef62bd92038c01a1781894f85 (diff) | |
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)