Merge branch 'acpi-pm' into pm-core
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Nov 2017 12:54:47 +0000 (13:54 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Nov 2017 12:54:47 +0000 (13:54 +0100)

Trivial merge