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)
commit048f35ff26a6c1b7297b43ec4376d9fa1872b4a9
treeb74634397306fb357a5d565e2b76bf199ce33106
parenteeb2d80d502af28e5660ff4bbe00f90ceb82c2db
parent20f97caf1120bd02e8ff4adbad3b44b63626feb5
Merge branch 'pm-qos' into acpi-pm
drivers/acpi/device_pm.c