Merge branch 'lorenzo/pci/dwc'