]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4c1cd4f f79a917)
Merge tag 'net-next-qcom-soc-4.7-2-merge' of git://github.com/andersson/kernel
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2016 18:11:19 +0000 (14:11 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2016 18:11:19 +0000 (14:11 -0400)
commit08a6ee5807711c4dfa0726e315864a408aa6c13c
tree908cda03c0f0104845311cabe0fabd105755474ftree | snapshot
parent4c1cd4fdfd14ecd417962f8c2166506132697f7ccommit | diff
parentf79a917e69e1f5cd86e864b67f06147f1b0340f4commit | 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.
MAINTAINERS diff1 | diff2 | blob | history
Michael's Linux tree.