diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 08:33:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 08:33:40 -0800 |
| commit | a51f67a4b440896dfc170ff3ce35994771b1267f (patch) | |
| tree | 66e69f83b63e8517a47e0eb0e7ae730d8a9a109b /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'driver-core-3.3-rc1-bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core (diff) | |
| parent | PM / Hibernate: Fix s2disk regression related to freezing workqueues (diff) | |
| download | linux-dev-a51f67a4b440896dfc170ff3ce35994771b1267f.tar.xz linux-dev-a51f67a4b440896dfc170ff3ce35994771b1267f.zip | |
Merge tag 'pm-fix-for-3.3-rc2' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions