]> 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)
commit8a4bf10f1a1cad7fde9400b519cd3812a324212f
treed7e60a44f6713af8a24f79f4720518d5ca30f8f5
parentd80e8c8297a7bcbc4e8cf931e3535d5a79ce774f
parent5aeca285d6e0c7de5599235047dc2f57321c1273
parent2ec210b5f4251dc4a2ea77ec03bef09df9bbc8b4
parent8416f5f697123238e43ca6e2b4718bf46921102a
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