Merge branch 'acpi-pci-hotplug' into acpi-dock