diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:09:20 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:09:20 +0100 |
| commit | 05e121af947aa59647762aaf3773b6f53f498f67 (patch) | |
| tree | d9697c5b3d78396ecb98d251a35e856bbf24118c /arch/mn10300/Kconfig | |
| parent | bb4f6ce2f3683e11e79d923eac945e49ddb6df4a (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
Diffstat (limited to 'arch/mn10300/Kconfig')
0 files changed, 0 insertions, 0 deletions