From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Fri, 15 Jul 2011 21:59:25 +0000 (+0200)
Subject: Merge branch 'pm-runtime' into for-linus
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7ae033cc0dfce68d8e0c83aca60837cf2bf0d2e6;p=deliverable%2Flinux.git

Merge branch 'pm-runtime' into for-linus

* pm-runtime:
  OMAP: PM: disable idle on suspend for GPIO and UART
  OMAP: PM: omap_device: add API to disable idle on suspend
  OMAP: PM: omap_device: add system PM methods for PM domain handling
  OMAP: PM: omap_device: conditionally use PM domain runtime helpers
  PM / Runtime: Add new helper function: pm_runtime_status_suspended()
  PM / Runtime: Consistent utilization of deferred_resume
  PM / Runtime: Prevent runtime_resume from racing with probe
  PM / Runtime: Replace "run-time" with "runtime" in documentation
  PM / Runtime: Improve documentation of enable, disable and barrier
  PM: Limit race conditions between runtime PM and system sleep (v2)
  PCI / PM: Detect early wakeup in pci_pm_prepare()
  PM / Runtime: Return special error code if runtime PM is disabled
  PM / Runtime: Update documentation of interactions with system sleep
---

7ae033cc0dfce68d8e0c83aca60837cf2bf0d2e6