Merge branch 'acpica' into acpi-sysfs
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 16 Sep 2016 23:08:27 +0000 (01:08 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 16 Sep 2016 23:08:27 +0000 (01:08 +0200)

Trivial merge