From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 6 Nov 2017 12:54:47 +0000 (+0100)
Subject: Merge branch 'acpi-pm' into pm-core
X-Git-Tag: v4.15-rc1~145^2~1^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=69a10ca747c2d2d7c0354a883335e097c067ed35;p=users%2Fwilly%2Flinux.git

Merge branch 'acpi-pm' into pm-core
---

69a10ca747c2d2d7c0354a883335e097c067ed35