Merge back earlier acpi-hotplug material.