Merge back power-related ACPI material for v4.12.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Apr 2017 19:12:57 +0000 (21:12 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Apr 2017 19:12:57 +0000 (21:12 +0200)

Trivial merge