Merge branch 'pci/enumeration'