From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 16 Oct 2017 22:29:58 +0000 (+0200)
Subject: Merge branch 'pm-qos' into acpi-pm
X-Git-Tag: v4.15-rc1~145^2~3^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=048f35ff26a6c1b7297b43ec4376d9fa1872b4a9;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'pm-qos' into acpi-pm
---

048f35ff26a6c1b7297b43ec4376d9fa1872b4a9