]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f37aae0 fc34216)
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Apr 2011 22:20:00 +0000 (15:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Apr 2011 22:20:00 +0000 (15:20 -0700)
commitb9b8a4e91be1c68d843903a099c67f273335adec
tree765680b0996f8af1d4263fa83daeb58935238841tree | snapshot
parentf37aae0364e3c7b7d009d8e376c8a49c18fecc8bcommit | diff
parentfc342165f6b2a7ef8bac968b2bb472d585887ec0commit | diff
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:
  ACPI / PM: Avoid infinite recurrence while registering power resources
  PM / Wakeup: Fix initialization of wakeup-related device sysfs files
Linux Kernel Source Tree.