projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4cada03
e3af9f7
)
Merge branch 'mvebu/fixes' into HEAD
author
Gregory CLEMENT
<
[email protected]
>
Fri, 5 Jan 2018 16:02:27 +0000
(17:02 +0100)
committer
Gregory CLEMENT
<
[email protected]
>
Fri, 5 Jan 2018 16:02:27 +0000
(17:02 +0100)
1
2
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
Simple merge
diff --cc
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
Simple merge