Files
android_kernel_xiaomi_sm8450/net/qrtr/smd.c
Bjorn Andersson f79a917e69 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.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
2016-05-13 14:42:23 -07:00

2.7 KiB