From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 12 Apr 2015 22:37:13 +0000 (+0200)
Subject: Merge branches 'pm-sleep' and 'pm-domains'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0fe0952b2191b19493adb847eb40c6f88e1caeaf;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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)
---

0fe0952b2191b19493adb847eb40c6f88e1caeaf