This merges the Qualcomm SOC tree with the net-next, solving the
merge conflict in the SMD API between the two.
Signed-off-by: NBjorn Andersson <bjorn.andersson@linaro.org>