Merge back earlier acpi-hotplug material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 22 Nov 2013 20:48:00 +0000 (21:48 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 22 Nov 2013 20:48:00 +0000 (21:48 +0100)

Trivial merge