Merge branch 'pci/portdrv'