Merge branch 'lorenzo/pci/xgene'