From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Jul 2009 16:35:22 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: firefly_0821_release~13458
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ed7ba2ef09254b2fd9698708b407f4652d26e36a;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: Clear -EAGAIN in dpm_prepare
  x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR
---

ed7ba2ef09254b2fd9698708b407f4652d26e36a