]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 74828ed bd87e7e)
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)
commit12ea0515de8ad4c4eb1a5be4be3f5a938cccaca9
tree908cda03c0f0104845311cabe0fabd105755474ftree | snapshot
parent74828eddcc6ddcba2dbdc5285a478c00f6d1e6ebcommit | diff
parentbd87e7e3d04524924e35260eaf2eea40760839d9commit | 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
Linux Kernel Source Tree.