diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-02-25 17:34:42 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-02-25 17:34:42 (GMT) |
| commit | 88dbede1da891a20b8499568122d29471c76b3b0 (patch) | |
| tree | 8030ece8c13b21a63bdfda141bb2701d60415512 /kernel/events/internal.h | |
| parent | 4a70931bd1b9370291e757bb2989431805f0bc41 (diff) | |
| parent | bc81526f379c78607e042ec15ebbe7e04c9950d5 (diff) | |
| download | linux-88dbede1da891a20b8499568122d29471c76b3b0.tar.xz | |
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 'kernel/events/internal.h')
0 files changed, 0 insertions, 0 deletions