projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0a96265 181e9bd)
Merge tag 'pm-fix-for-3.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jan 2012 16:33:40 +0000 (08:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jan 2012 16:33:40 +0000 (08:33 -0800)
commita51f67a4b440896dfc170ff3ce35994771b1267f
tree66e69f83b63e8517a47e0eb0e7ae730d8a9a109btree | snapshot
parent0a9626575400879d1d5e6bc8768188b938d7c501commit | diff
parent181e9bdef37bfcaa41f3ab6c948a2a0d60a268b5commit | diff
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
John Crispins staging tree