Merge branch 'acpica' into acpi-dma
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Aug 2017 22:14:35 +0000 (00:14 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Aug 2017 22:14:35 +0000 (00:14 +0200)

Trivial merge