Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jul 2009 16:35:22 +0000 (09:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jul 2009 16:35:22 +0000 (09:35 -0700)
commited7ba2ef09254b2fd9698708b407f4652d26e36a
treed16ea988b54d906704003ab086498c184afe1a1f
parent4b99d3527041bec1abe9903263a3a1b7d2ba0c4a
parent886a7a3371da8ee46a13f8e598a536bd8765b837
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