git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e3fad9a
9f32ccc
)
Merge tag 'marvell-boards-net-for-3.8' of github.com:MISL-EBU-System-SW/mainline...
author
Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>
Tue, 20 Nov 2012 22:35:16 +0000
(23:35 +0100)
committer
Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>
Tue, 20 Nov 2012 22:35:16 +0000
(23:35 +0100)
Marvell boards changes related to Ethernet, for 3.8
Conflicts:
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-xp-db.dts
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Trivial merge