From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Oct 2010 00:31:05 +0000 (-0700)
Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe... 
X-Git-Tag: v2.6.37-rc1~99
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d2d8f66bb991757e360728da77920e18bd678767;p=~emulex%2Finfiniband.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 / Runtime: fix recursive locking warning of lockdep from rpm_resume()
---

d2d8f66bb991757e360728da77920e18bd678767