summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-03-14 10:51:38 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-03-14 10:51:38 +0100
commite6035258dbf9804b8e22878d3932e418c8875963 (patch)
treed7e60a44f6713af8a24f79f4720518d5ca30f8f5 /drivers/base
parent7a5bd1279bce2116af67979bea311a0ccc4b8bb9 (diff)
parent0996584b3026bed7f38abe02e8535e6a6c474118 (diff)
parent623217a0cc45a6c179303b3bbfdc594806a464cc (diff)
parent07a6c71bbd4a85a619069a00d37e7232edf2306e (diff)
downloadlinux-e6035258dbf9804b8e22878d3932e418c8875963.tar.bz2
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