Merge branch 'acpica' into acpi-ec
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 5 Feb 2015 14:42:08 +0000 (15:42 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 5 Feb 2015 14:42:08 +0000 (15:42 +0100)

Trivial merge