tree 86b5385a63281824908d59107066b1267f75a386
parent fe41947e1aa12e96a50edaee123b4e4de03b668b
parent 805bdaec1a44155db35f6ee5410d6bbc365324a8
author Linus Torvalds <torvalds@linux-foundation.org> 1298675717 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1298675717 -0800

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/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