From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Apr 2010 00:49:48 +0000 (-0700)
Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe... 
X-Git-Tag: v2.6.34-rc5~22
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=2ba3abd8186f24c7fb418927025b4e2120e3a362

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
---

2ba3abd8186f24c7fb418927025b4e2120e3a362