Merge back ACPICA changes for v4.12.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 14 Apr 2017 22:25:28 +0000 (00:25 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 14 Apr 2017 22:25:28 +0000 (00:25 +0200)

Trivial merge