Merge branch 'pm-qos' into acpi-pm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 16 Oct 2017 22:29:58 +0000 (00:29 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 16 Oct 2017 22:29:58 +0000 (00:29 +0200)
1  2 
drivers/acpi/device_pm.c

Simple merge