Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 22:09:56 +0000 (15:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 22:09:56 +0000 (15:09 -0700)
commit91ab9bf7c5322128d3b29c04393268658631e26a
tree7a9b91ba1040fb2d070f0d77a0922532fdfa23a8
parentb7bdcc47114595b4b359fe0f7d941bb901e9261d
parent78ca7c37efaa541006269aa3d3e560ea7926e245
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 typo in status comparison causing warning