Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Dec 2010 17:31:59 +0000 (09:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Dec 2010 17:31:59 +0000 (09:31 -0800)
commit508817e7cd8cb585148d12b5673202142ece2330
tree5041771f203c906afce49d9e75e5e856f77a903f
parent8efc1a1a22e6daf9d669e6095460c77df683c325
parentf08f5a0add20834d3f3d876dfe08005a5df656db
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 pm_runtime_suspended()
  PM / Hibernate: Restore old swap signature to avoid user space breakage
  PM / Hibernate: Fix PM_POST_* notification with user-space suspend