Merge branch 'pci/pm'