Merge branch 'acpi-hotplug'