Merge branch 'acpica' into acpi-resources
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Feb 2015 21:27:01 +0000 (22:27 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Feb 2015 21:27:01 +0000 (22:27 +0100)

Trivial merge