Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Oct 2010 00:31:05 +0000 (17:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Oct 2010 00:31:05 +0000 (17:31 -0700)
commitd2d8f66bb991757e360728da77920e18bd678767
tree35153633d38767991410013d2acd354c80bc0aec
parent474829e875ab93512dbe0a713f564d3cd3874bc9
parentd63be5f924cf054e7ac18bb2761f9533039fb076
Merge branch 'pm-fixes' of git://git./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()