projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60658f8 c9e664f)
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Dec 2010 23:51:14 +0000 (15:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Dec 2010 23:51:14 +0000 (15:51 -0800)
* '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


Trivial merge
John Crispins staging tree