Merge branch 'pci/misc'