Merge branch 'pm-qos'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 13 Nov 2017 00:33:48 +0000 (01:33 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 13 Nov 2017 00:33:48 +0000 (01:33 +0100)
commit4762573b934cced83b91950f0e7a9f160e3983e3
tree3ab9a54af2bf2f66776b020eee4f7dbe897912b0
parent29aaf90875de6a1a760d555f815b18e412b5ab98
parent0759e80b84e34a84e7e46e2b1adb528c83d84a47
Merge branch 'pm-qos'

* pm-qos:
  PM / QoS: Fix device resume latency framework
  PM / QoS: Drop PM_QOS_FLAG_REMOTE_WAKEUP
drivers/base/power/domain.c
include/linux/pm_qos.h