Merge back earlier 'acpi-assorted' material
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 14 Aug 2013 21:22:45 +0000 (23:22 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 14 Aug 2013 21:22:45 +0000 (23:22 +0200)

Trivial merge