From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Apr 2009 15:43:06 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: firefly_0821_release~14403
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a939b96cccdb65df80a52447ec8e4a6d79c56dbb;p=firefly-linux-kernel-4.4.55.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:
  PM/Suspend: Introduce two new platform callbacks to avoid breakage
---

a939b96cccdb65df80a52447ec8e4a6d79c56dbb