diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-07 00:51:14 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-07 00:51:14 +0100 |
commit | 7787d2c2f440cc7854bed3d039bf4cc59d9e7897 (patch) | |
tree | d7402ea46b2aa0a4d049e8edc61a302bda4db4d5 /arch | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | PM / Hibernate: Fix memory corruption related to swap (diff) | |
download | linux-7787d2c2f440cc7854bed3d039bf4cc59d9e7897.tar.xz linux-7787d2c2f440cc7854bed3d039bf4cc59d9e7897.zip |
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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions