| commit | 08a6ee5807711c4dfa0726e315864a408aa6c13c | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue May 17 14:11:19 2016 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Tue May 17 14:11:19 2016 -0400 |
| tree | 908cda03c0f0104845311cabe0fabd105755474f | |
| parent | 4c1cd4fdfd14ecd417962f8c2166506132697f7c [diff] | |
| parent | f79a917e69e1f5cd86e864b67f06147f1b0340f4 [diff] |
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.