projects / platform / kernel / linux-stable.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f43c606 40fea92)
Merge tag 'pm-3.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Aug 2013 16:59:00 +0000 (09:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Aug 2013 16:59:00 +0000 (09:59 -0700)
commit2d2843e614f6f7aced9dd351a056ac1150d3f82f
tree2930c51e63e9f8a69593e4e08023b4bdcfa8df91tree | snapshot
parentf43c60648f2b093983fe8f6145acef12c48751cbcommit | diff
parent40fea92ffb5fa0ef26d10ae0fe5688bc8e61c791commit | diff
Merge tag 'pm-3.11-rc6' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
 "The removal of delayed_work_pending() checks from kernel/power/qos.c
  done in 3.9 introduced a deadlock in pm_qos_work_fn().

  Fix from Stephen Boyd"

* tag 'pm-3.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / QoS: Fix workqueue deadlock when using pm_qos_update_request_timeout()
Domain: System / Kernel;