Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
commit493f3358cb289ccf716c5a14fa5bb52ab75943e5
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Feb 2011 23:15:17 +0000 (25 15:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Feb 2011 23:15:17 +0000 (25 15:15 -0800)
tree86b5385a63281824908d59107066b1267f75a386
parentfe41947e1aa12e96a50edaee123b4e4de03b668b
parent805bdaec1a44155db35f6ee5410d6bbc365324a8
Merge branch 'pm-fixes' of git://git./linux/kernel/git/rafael/suspend-2.6

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM: Make ACPI wakeup from S5 work again when CONFIG_PM_SLEEP is unset