Merge tag 'pm-fixes-for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Jan 2012 23:11:27 +0000 (15:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Jan 2012 23:11:27 +0000 (15:11 -0800)
commitac1e3d4f5c1097422c6e72aeae322033e9a8c803
treeadcebdad5f515a8453bfe48940822f57a6904c9d
parenteaed435a7b870a38d89dbdb535c7842d618d3214
parente4c89a508f4385a0cd8681c2749a2cd2fa476e40
Merge tag 'pm-fixes-for-3.3' of git://git./linux/kernel/git/rafael/linux-pm

Power management fixes for 3.3

Two fixes for regressions introduced during the merge window, one fix for
a long-standing obscure issue in the computation of hibernate image size
and two small PM documentation fixes.

* tag 'pm-fixes-for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Sleep: Fix read_unlock_usermodehelper() call.
  PM / Hibernate: Rewrite unlock_system_sleep() to fix s2disk regression
  PM / Hibernate: Correct additional pages number calculation
  PM / Documentation: Fix minor issue in freezing_of_tasks.txt
  PM / Documentation: Fix spelling mistake in basic-pm-debugging.txt