]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-core', 'pm-sleep' and 'pm-qos'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 14 Mar 2019 09:51:38 +0000 (10:51 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 14 Mar 2019 09:51:38 +0000 (10:51 +0100)
commit40079350a76261d6df5062fab0b328aaf7a0ea01
treed7e60a44f6713af8a24f79f4720518d5ca30f8f5
parent31c3385831ce9febdb64e9a8cea9af0b117bcaad
parentf8bba7e6c765a017bd4ea7d15a7e9cb025ba2cc8
parentc06cf0ce0fc9f37360ee425335c279b781ab8a35
parent4117f24135d4e22b9fe2872e004ea464e91657f3
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
drivers/base/power/wakeup.c