Merge branch 'acpi-pci-hotplug'