projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ed7cbbc b853cb9)
Merge tag 'qcom-soc-for-4.7-2' into net-next
authorBjorn Andersson <bjorn.andersson@linaro.org>
Fri, 13 May 2016 21:36:11 +0000 (14:36 -0700)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Fri, 13 May 2016 21:42:23 +0000 (14:42 -0700)
commitf79a917e69e1f5cd86e864b67f06147f1b0340f4
tree561675103ee8a220365e7c907e51d6c362727ff7tree | snapshot
parented7cbbce544856b20e5811de373cf92e92499771commit | diff
parentb853cb9628bfbcc4017da46d5f5b46e3eba9d8c6commit | diff
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>
MAINTAINERS diff1 | diff2 | blob | history
include/linux/soc/qcom/smd.h diff1 | diff2 | blob | history
net/qrtr/smd.c diff1 | | blob | history
Unnamed repository; edit this file 'description' to name the repository.