diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:42:09 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:42:09 +0100 |
| commit | 74f980beaa660614c707675ce6a11e70db3d49b6 (patch) | |
| tree | 1850743db35687b9015d775c8fd494e60dee86fc /arch/arm/boot/dts/armada-370-xp.dtsi | |
| parent | 895e4e3a7da0fea246e736dd815b4d04851ea387 (diff) | |
| parent | 8dc40c19efad15f5bdb77b8d1ccf902902c00c58 (diff) | |
Merge tag 'marvell-net-xor-defconfig-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge
Marvell mvebu defconfig updates for 3.8
Conflicts:
arch/arm/configs/mvebu_defconfig
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/armada-370-xp.dtsi')
0 files changed, 0 insertions, 0 deletions