Marvell boards changes related to Ethernet, for 3.8

Browse source

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iEYEABECAAYFAlCmB6oACgkQ9lPLMJjT96elAwCfQyZY9HP0PW+0y2VRbKLYlrTW
 vaQAoJMNKRaxjBwnF5As4I4/5g0rsE/H
 =hRb7
 -----END PGP SIGNATURE-----

Merge tag 'marvell-boards-net-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge

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>

...

This commit is contained in:

Thomas Petazzoni 2012-11-20 23:35:16 +01:00

parent e3fad9a4f8 9f32cccc67

commit 089c38e724

7 changed files with 274 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/arm/boot/dts/Makefile

View file

23

arch/arm/boot/dts/armada-370-db.dts

View file

58

arch/arm/boot/dts/armada-370-mirabox.dts

View file

20

arch/arm/boot/dts/armada-370-xp.dtsi

View file

44

arch/arm/boot/dts/armada-xp-db.dts

View file

112

arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

View file

14

arch/arm/boot/dts/armada-xp.dtsi

View file