Merge branches 'acpi-pci-pm' and 'acpi-pci-hotplug'