diff options
author | 2014-02-25 18:34:42 +0100 | |
---|---|---|
committer | 2014-02-25 18:34:42 +0100 | |
commit | 88dbede1da891a20b8499568122d29471c76b3b0 (patch) | |
tree | 8030ece8c13b21a63bdfda141bb2701d60415512 /tools/perf/scripts/python/syscall-counts-by-pid.py | |
parent | Merge branch 'mvebu/soc' into next/soc (diff) | |
parent | Documentation: arm: update Marvell documentation about Armada 375/38x (diff) | |
download | linux-dev-88dbede1da891a20b8499568122d29471c76b3b0.tar.xz linux-dev-88dbede1da891a20b8499568122d29471c76b3b0.zip |
Merge tag 'mvebu-soc-3xx-3.15' of git://git.infradead.org/linux-mvebu into next/soc
Merge "mvebu new SoCs for v3.15" from Jason Cooper:
- mvebu
- initial support for Armada 375, 380, and 385
Depends:
- tags/mvebu-soc-3.15 (resolves delete/rename hidden conflict)
* tag 'mvebu-soc-3xx-3.15' of git://git.infradead.org/linux-mvebu:
Documentation: arm: update Marvell documentation about Armada 375/38x
ARM: mvebu: add initial support for the Armada 380/385 SOCs
ARM: mvebu: add workaround for data abort issue on Armada 375
ARM: mvebu: add initial support for the Armada 375 SOCs
ARM: mvebu: add Armada 375 support to the system-controller driver
ARM: mvebu: make CPU_PJ4B selection a per-SoC choice
ARM: mvebu: rename DT machine structure for Armada 370/XP
ARM: mvebu: rename armada-370-xp.c to board-v7.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts-by-pid.py')
0 files changed, 0 insertions, 0 deletions