Merge back earlier 'acpi-assorted' material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 25 Oct 2013 21:39:25 +0000 (23:39 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 25 Oct 2013 21:39:25 +0000 (23:39 +0200)

Trivial merge