diff options
| author | Linus Torvalds | 2012-04-04 14:26:40 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2012-04-04 14:26:40 -0700 |
| commit | 64ebe987311853ea857a244439de5b947a4b1b07 (patch) | |
| tree | b33ab6efd7f118e0f6ab5a6bcbd59ba31a313da5 /block | |
| parent | a5149bf3fed59b94207809704b5d06fec337a771 (diff) | |
| parent | c4772d192c70b61d52262b0db76f7abd8aeb51c6 (diff) | |
Merge tag 'pm-for-3.4-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more power management updates from Rafael Wysocki:
- Patch series that hopefully fixes races between the freezer and
request_firmware() and request_firmware_nowait() for good, with two
cleanups from Stephen Boyd on top.
- Runtime PM fix from Alan Stern preventing tasks from getting stuck
indefinitely in the runtime PM wait queue.
- Device PM QoS update from MyungJoo Ham introducing a new variant of
pm_qos_update_request() allowing the callers to specify a timeout.
* tag 'pm-for-3.4-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / QoS: add pm_qos_update_request_timeout() API
firmware_class: Move request_firmware_nowait() to workqueues
firmware_class: Reorganize fw_create_instance()
PM / Sleep: Mitigate race between the freezer and request_firmware()
PM / Sleep: Move disabling of usermode helpers to the freezer
PM / Hibernate: Disable usermode helpers right before freezing tasks
firmware_class: Do not warn that system is not ready from async loads
firmware_class: Split _request_firmware() into three functions, v2
firmware_class: Rework usermodehelper check
PM / Runtime: don't forget to wake up waitqueue on failure
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions