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)
commit2ba3abd8186f24c7fb418927025b4e2120e3a362
tree1b88919b5e687c77627d91855b214ed5067997da
parent0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42
parentd88d4050dcaf09e417aaa9a5024dd9449ef71b2e
Merge branch 'pm-fixes' of git://git./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: user.c, fix SNAPSHOT_SET_SWAP_AREA handling