| commit | f79a917e69e1f5cd86e864b67f06147f1b0340f4 | [log] [tgz] |
|---|---|---|
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | Fri May 13 14:36:11 2016 -0700 |
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | Fri May 13 14:42:23 2016 -0700 |
| tree | 561675103ee8a220365e7c907e51d6c362727ff7 | |
| parent | ed7cbbce544856b20e5811de373cf92e92499771 [diff] | |
| parent | b853cb9628bfbcc4017da46d5f5b46e3eba9d8c6 [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>