Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Apr 2011 00:18:05 +0000 (17:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Apr 2011 00:18:05 +0000 (17:18 -0700)
commitaaa119a3d4e0b7421c82ae3fbe288e65d0f3485f
tree134923311a0ec019a1365f3ed87ffe32dae37f19
parent6faf9a54156fb4d01d73344cc90cb52dda074433
parentd419e4c0f7584ffc5c72d9aeeaac485cc756ebcf
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
drivers/base/platform.c