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)
* pm-qos:
  PM / QoS: Fix device resume latency framework
  PM / QoS: Drop PM_QOS_FLAG_REMOTE_WAKEUP

1  2 
drivers/base/power/domain.c
include/linux/pm_qos.h

Simple merge
Simple merge