tree 35153633d38767991410013d2acd354c80bc0aec
parent 474829e875ab93512dbe0a713f564d3cd3874bc9
parent d63be5f924cf054e7ac18bb2761f9533039fb076
author Linus Torvalds <torvalds@linux-foundation.org> 1288139465 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1288139465 -0700

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()