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