Skip to content
net-next-qcom-soc-4.7-2-merge
Bjorn Andersson's avatar
Bjorn Andersson
@bjorn.andersson
f79a917e · Merge tag 'qcom-soc-for-4.7-2' into net-next ·
Unverified 
Merge tag 'qcom-soc-for-4.7-2' into net-next

This merges the Qualcomm SOC tree with the net-next, solving the
merge conflict in the SMD API between the two.