Merge branch 'acpica' into acpi-pm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 30 Sep 2014 19:05:34 +0000 (21:05 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 30 Sep 2014 19:05:34 +0000 (21:05 +0200)

Trivial merge