tree 3361f14eee716d5512a0c423ec89631a5b976ef4
parent b07ad9967f40b164af77205027352ba53729cf5a
parent 19234c0819da0e043a02710488dfd9b242b42eba
author Linus Torvalds <torvalds@linux-foundation.org> 1303623316 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1303623316 -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: Add missing syscore_suspend() and syscore_resume() calls
  PM: Fix error code paths executed after failing syscore_suspend()