Merge branch 'pci/qcom'