diff options
author | 2012-11-20 23:40:29 +0100 | |
---|---|---|
committer | 2012-11-20 23:40:29 +0100 | |
commit | 895e4e3a7da0fea246e736dd815b4d04851ea387 (patch) | |
tree | 5fd0137d292400d83fed427cf98c1b1d31ef2ffe /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'marvell-xor-cleanup-dt-binding-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge (diff) | |
parent | arm: mvebu: add XOR engines to Armada XP .dtsi (diff) | |
download | linux-dev-895e4e3a7da0fea246e736dd815b4d04851ea387.tar.xz linux-dev-895e4e3a7da0fea246e736dd815b4d04851ea387.zip |
Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge
Marvell XOR driver DT changes for 3.8
Conflicts:
arch/arm/boot/dts/armada-xp.dtsi
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