diff options
author | 2012-11-20 23:35:16 +0100 | |
---|---|---|
committer | 2012-11-20 23:35:16 +0100 | |
commit | 089c38e7245e052951dce7a6916b12631a26561d (patch) | |
tree | 5ca0a8f3ccc125f4c46217d1e1b97812d8baf4bd /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'marvell-neta-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge (diff) | |
parent | arm: mvebu: enable Ethernet controllers on Mirabox platform (diff) | |
download | linux-dev-089c38e7245e052951dce7a6916b12631a26561d.tar.xz linux-dev-089c38e7245e052951dce7a6916b12631a26561d.zip |
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>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions