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