| commit | 089c38e7245e052951dce7a6916b12631a26561d | [log] [tgz] |
|---|---|---|
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | Tue Nov 20 23:35:16 2012 +0100 |
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | Tue Nov 20 23:35:16 2012 +0100 |
| tree | 5ca0a8f3ccc125f4c46217d1e1b97812d8baf4bd | |
| parent | e3fad9a4f820d3913689ca228dc5a75db1e64ce6 [diff] | |
| parent | 9f32cccc67590ccda30529bcbcea5c22d95c00a6 [diff] |
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>