Merge branch 'pci/vpd'