From: Bjorn Andersson <bjorn.anders...@linaro.org> Date: Fri, 13 May 2016 15:19:09 -0700
> I have prepared the merge of net-next and the conflicting tag from the > Qualcomm SOC, please include this in your pull towards Linus to avoid > the merge conflict. Pulled, thanks.
