Merge branch 'acpica' into acpi-bus
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Sep 2016 12:44:12 +0000 (14:44 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Sep 2016 12:44:12 +0000 (14:44 +0200)

Trivial merge