diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-16 18:59:00 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-16 18:59:00 +0200 |
commit | 2d2843e614f6f7aced9dd351a056ac1150d3f82f (patch) | |
tree | 2930c51e63e9f8a69593e4e08023b4bdcfa8df91 /net | |
parent | Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai... (diff) | |
parent | PM / QoS: Fix workqueue deadlock when using pm_qos_update_request_timeout() (diff) | |
download | linux-2d2843e614f6f7aced9dd351a056ac1150d3f82f.tar.xz linux-2d2843e614f6f7aced9dd351a056ac1150d3f82f.zip |
Merge tag 'pm-3.11-rc6' of git://git.kernel.org/pub/scm/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()
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions