Merge branch 'acpi-pm' into pm-sleep
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 11 Oct 2017 13:39:38 +0000 (15:39 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 11 Oct 2017 13:39:38 +0000 (15:39 +0200)

Trivial merge