Merge branch 'pm-pci'