From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Apr 2011 00:18:05 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v3.12-rc1~6380
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aaa119a3d4e0b7421c82ae3fbe288e65d0f3485f;p=kernel%2Fkernel-generic.git

Merge branch 'for-linus' of git://git./linux/kernel/git/rafael/suspend-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  fix XEN_SAVE_RESTORE Kconfig dependencies
  PM / Hibernate: Introduce CONFIG_HIBERNATE_CALLBACKS
---

aaa119a3d4e0b7421c82ae3fbe288e65d0f3485f