Merge back earlier ACPICA changes for v4.11.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 30 Jan 2017 07:57:22 +0000 (08:57 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 30 Jan 2017 07:57:22 +0000 (08:57 +0100)

Trivial merge