diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-03-14 10:51:38 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-03-14 10:51:38 +0100 |
| commit | e6035258dbf9804b8e22878d3932e418c8875963 (patch) | |
| tree | d7e60a44f6713af8a24f79f4720518d5ca30f8f5 /drivers/base | |
| parent | PM: Add and use pr_fmt() (diff) | |
| parent | PM-runtime: Call pm_runtime_active|suspended_time() from sysfs (diff) | |
| parent | PM / wakeup: Drop wakeup_source_drop() (diff) | |
| parent | PM / QoS: Fix typo in file description (diff) | |
| download | linux-e6035258dbf9804b8e22878d3932e418c8875963.tar.xz linux-e6035258dbf9804b8e22878d3932e418c8875963.zip | |
Merge branches 'pm-core', 'pm-sleep' and 'pm-qos'
* pm-core:
PM-runtime: Call pm_runtime_active|suspended_time() from sysfs
PM-runtime: Consolidate code to get active/suspended time
* pm-sleep:
PM / wakeup: Drop wakeup_source_drop()
PM / wakeup: Rework wakeup source timer cancellation
* pm-qos:
PM / QoS: Fix typo in file description