]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Feb 2011 23:15:17 +0000 (15:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Feb 2011 23:15:17 +0000 (15:15 -0800)
commit31993b7127a55a5a5b5fd84a6e6bc182f78f562a
tree86b5385a63281824908d59107066b1267f75a386
parentfe417de1c3e9578a313988cb7ee2aefe472f0d45
parent22881154db2e967b72bcdc3c92151dd010b26852
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