tree 5041771f203c906afce49d9e75e5e856f77a903f
parent 8efc1a1a22e6daf9d669e6095460c77df683c325
parent f08f5a0add20834d3f3d876dfe08005a5df656db
author Linus Torvalds <torvalds@linux-foundation.org> 1292607119 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292607119 -0800

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 pm_runtime_suspended()
  PM / Hibernate: Restore old swap signature to avoid user space breakage
  PM / Hibernate: Fix PM_POST_* notification with user-space suspend