Merge branch 'pci/pm' into next