From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Jun 2012 02:05:41 +0000 (-0700)
Subject: Merge tag 'pm-for-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=02529ba26f444e2a214c3dcacd866928e9edcfc0;p=~shefty%2Frdma-dev.git

Merge tag 'pm-for-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael J. Wysocki:

 * Fix for a bug in async suspend error code path causing parents to
   wait forever for their children in case of a suspend error from
   Mandeep Singh Baines (-stable metarial).

 * Fix for a suspend regression related to earlier changes in the ACPI
   cpuidle driver from Deepthi Dharwar.

* tag 'pm-for-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / ACPI: Fix suspend/resume regression caused by cpuidle cleanup.
  PM / Sleep: Prevent waiting forever on asynchronous suspend after abort
---

02529ba26f444e2a214c3dcacd866928e9edcfc0