Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM / Freezer: Revert 27920651 "PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too" PM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freezer_count USB: Update last_busy time after autosuspend fails PM / Runtime: Automatically retry failed autosuspends PM / QoS: Remove redundant check PM / OPP: Fix build when CONFIG_PM_OPP is not set PM / Runtime: Fix runtime accounting calculation error PM / Sleep: Update freezer documentation PM / Sleep: Remove unused symbol 'suspend_cpu_hotplug' PM / Sleep: Fix race between CPU hotplug and freezer ACPI / PM: Add Sony VPCEB17FX to nonvs blacklist
Showing
- Documentation/power/freezing-of-tasks.txt 4 additions, 4 deletionsDocumentation/power/freezing-of-tasks.txt
- Documentation/power/runtime_pm.txt 10 additions, 0 deletionsDocumentation/power/runtime_pm.txt
- drivers/acpi/sleep.c 8 additions, 0 deletionsdrivers/acpi/sleep.c
- drivers/base/power/runtime.c 17 additions, 6 deletionsdrivers/base/power/runtime.c
- drivers/usb/core/driver.c 5 additions, 0 deletionsdrivers/usb/core/driver.c
- include/linux/cpu.h 0 additions, 4 deletionsinclude/linux/cpu.h
- include/linux/freezer.h 3 additions, 8 deletionsinclude/linux/freezer.h
- include/linux/opp.h 2 additions, 2 deletionsinclude/linux/opp.h
- kernel/cpu.c 74 additions, 0 deletionskernel/cpu.c
- kernel/freezer.c 1 addition, 1 deletionkernel/freezer.c
- kernel/power/qos.c 1 addition, 2 deletionskernel/power/qos.c
Loading
Please register or sign in to comment