Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Apr 2011 05:35:16 +0000 (22:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Apr 2011 05:35:16 +0000 (22:35 -0700)
commit686c4cbb10fc0e75b29b097290b4f7fc3f010b9e
tree3361f14eee716d5512a0c423ec89631a5b976ef4
parentb07ad9967f40b164af77205027352ba53729cf5a
parent19234c0819da0e043a02710488dfd9b242b42eba
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: Add missing syscore_suspend() and syscore_resume() calls
  PM: Fix error code paths executed after failing syscore_suspend()