From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 Apr 2012 22:00:44 +0000 (-0700)
Subject: Merge tag 'pm-for-3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: firefly_0821_release~3680^2~2976
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6cfdd02b886aac866098f33262d409565f101ce0;p=firefly-linux-kernel-4.4.55.git

Merge tag 'pm-for-3.4-rc5' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael J. Wysocki:
 "Fix for an issue causing hibernation to hang on systems with highmem
  (that practically means i386) due to broken memory management (bug
  introduced in 3.2, so -stable material) and PM documentation update
  making the freezer documentation follow the code again after some
  recent updates."

* tag 'pm-for-3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Freezer / Docs: Update documentation about freezing of tasks
  PM / Hibernate: fix the number of pages used for hibernate/thaw buffering
---

6cfdd02b886aac866098f33262d409565f101ce0