| commit | 7787d2c2f440cc7854bed3d039bf4cc59d9e7897 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 06 15:51:14 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 06 15:51:14 2010 -0800 |
| tree | d7402ea46b2aa0a4d049e8edc61a302bda4db4d5 | |
| parent | 60658f8a293750b59a8a844bf5c387139af9500a [diff] | |
| parent | c9e664f1fdf34aa8cede047b206deaa8f1945af0 [diff] |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Hibernate: Fix memory corruption related to swap PM / Hibernate: Use async I/O when reading compressed hibernation image