From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Sep 2010 22:50:53 +0000 (-0700)
Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe... 
X-Git-Tag: v2.6.36-rc4~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=84e1d836ef0759a152578a961894824bde89596f;p=~shefty%2Frdma-dev.git

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / Hibernate: Avoid hitting OOM during preallocation of memory
  PM QoS: Correct pr_debug() misuse and improve parameter checks
  PM: Prevent waiting forever on asynchronous resume after failing suspend
---

84e1d836ef0759a152578a961894824bde89596f