From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 13 Nov 2017 00:33:48 +0000 (+0100)
Subject: Merge branch 'pm-qos'
X-Git-Tag: v4.15-rc1~145^2~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4762573b934cced83b91950f0e7a9f160e3983e3;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'pm-qos'

* pm-qos:
  PM / QoS: Fix device resume latency framework
  PM / QoS: Drop PM_QOS_FLAG_REMOTE_WAKEUP
---

4762573b934cced83b91950f0e7a9f160e3983e3