Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Feb 2011 01:52:36 +0000 (17:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Feb 2011 01:52:36 +0000 (17:52 -0800)
commit2a324ce7b79a3a90cc2d4ade5d5f960a99000caa
treee512801f47280fae8813ff2a102411a343a3c380
parentc8b392e9ad7332b8e44f7f15dafa5fc837f7da8d
parent2e725a065b0153f0c449318da1923a120477633d
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: Return error code when alloc_image_page() fails