Merge branch 'pci/virtualization'