From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 14 Mar 2019 09:51:38 +0000 (+0100)
Subject: Merge branches 'pm-core', 'pm-sleep' and 'pm-qos'
X-Git-Tag: v5.1-rc1~29^2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e6035258dbf9804b8e22878d3932e418c8875963;p=linux-block.git

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
---

e6035258dbf9804b8e22878d3932e418c8875963