From: David S. Miller <davem@davemloft.net>
Date: Tue, 17 May 2016 18:11:19 +0000 (-0400)
Subject: Merge tag 'net-next-qcom-soc-4.7-2-merge' of git://github.com/andersson/kernel
X-Git-Tag: v6.1~16589^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08a6ee5807711c4dfa0726e315864a408aa6c13c;p=sdk%2Femulator%2Femulator-kernel.git

Merge tag 'net-next-qcom-soc-4.7-2-merge' of git://github.com/andersson/kernel

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.
---

08a6ee5807711c4dfa0726e315864a408aa6c13c