Merge branch 'pci/trivial'