summaryrefslogtreecommitdiff
path: root/drivers/net/sb1000.c
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-20 22:09:20 (GMT)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-20 22:09:20 (GMT)
commit05e121af947aa59647762aaf3773b6f53f498f67 (patch)
treed9697c5b3d78396ecb98d251a35e856bbf24118c /drivers/net/sb1000.c
parentbb4f6ce2f3683e11e79d923eac945e49ddb6df4a (diff)
parent9f32cccc67590ccda30529bcbcea5c22d95c00a6 (diff)
downloadlinux-fsl-qoriq-05e121af947aa59647762aaf3773b6f53f498f67.tar.xz
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 'drivers/net/sb1000.c')
0 files changed, 0 insertions, 0 deletions