Merge branch 'acpica' into acpi-pm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 1 Dec 2014 22:51:00 +0000 (23:51 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 1 Dec 2014 22:51:00 +0000 (23:51 +0100)

Trivial merge