From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Jan 2012 16:33:40 +0000 (-0800)
Subject: Merge tag 'pm-fix-for-3.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae... 
X-Git-Tag: firefly_0821_release~3680^2~3615
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a51f67a4b440896dfc170ff3ce35994771b1267f;p=firefly-linux-kernel-4.4.55.git

Merge tag 'pm-fix-for-3.3-rc2' of git://git./linux/kernel/git/rafael/linux-pm

Power management fix for 3.3-rc2

Fix for a hibernate (s2disk) regression introduced during the 3.2
merge window that causes s2disk to trigger BUG_ON() in
freeze_workqueues_begin() if there is not enough swap space to save
the image.

* tag 'pm-fix-for-3.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Hibernate: Fix s2disk regression related to freezing workqueues
---

a51f67a4b440896dfc170ff3ce35994771b1267f