projects
/
platform
/
kernel
/
linux-rpi3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4c1cd4f
f79a917
)
Merge tag 'net-next-qcom-soc-4.7-2-merge' of git://github.com/andersson/kernel
author
David S. Miller
<davem@davemloft.net>
Tue, 17 May 2016 18:11:19 +0000
(14:11 -0400)
committer
David S. Miller
<davem@davemloft.net>
Tue, 17 May 2016 18:11:19 +0000
(14:11 -0400)
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.
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge