projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0fdfe5a d88d405)
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Apr 2010 00:49:48 +0000 (17:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Apr 2010 00:49:48 +0000 (17:49 -0700)
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / Hibernate: user.c, fix SNAPSHOT_SET_SWAP_AREA handling


Trivial merge
John Crispins staging tree