Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Apr 2009 15:43:06 +0000 (08:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Apr 2009 15:43:06 +0000 (08:43 -0700)
commita939b96cccdb65df80a52447ec8e4a6d79c56dbb
treeb2d03cee9f019d360c03518dd447aa0e5b66db33
parent5cab3856e76f4e6dd44731cea054021105e3e02d
parent6a7c7eaf71b636f197d73b381a2ab729ebdcfb2e
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:
  PM/Suspend: Introduce two new platform callbacks to avoid breakage