Merge branch 'pci/hotplug'