Merge branch 'pci/controller/qcom'