tree e512801f47280fae8813ff2a102411a343a3c380
parent c8b392e9ad7332b8e44f7f15dafa5fc837f7da8d
parent 2e725a065b0153f0c449318da1923a120477633d
author Linus Torvalds <torvalds@linux-foundation.org> 1297993956 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1297993956 -0800

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/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