Merge branch 'acpica' into acpi-trace
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Aug 2015 00:40:55 +0000 (02:40 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Aug 2015 00:40:55 +0000 (02:40 +0200)

Trivial merge