diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 14:53:01 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 14:53:01 +0200 |
| commit | 6d5853ffe655192d4b18d7092bb060d5e69d777c (patch) | |
| tree | 423846bde0490cc2ac3323b4ec026d8f641f90fd /MAINTAINERS | |
| parent | d7c38ff1cd868cd61b96cf1ff8c2bd72445332c7 (diff) | |
| parent | 1f664ab7d9d46abdcde294e3e6e9d5d98a2e6f73 (diff) | |
| download | linux-6d5853ffe655192d4b18d7092bb060d5e69d777c.tar.bz2 | |
Merge tag 'mvebu-arm64-4.7-1' of git://git.infradead.org/linux-mvebu into next/arm64
Merge "mvebu arm64 for 4.7" from Gregory CLEMENT:
- Mention the arm64 SoCs in the MAINTAINER file
- Enable syscon drivers for Marvell Armada 7K/8K (replacing the clk
one)
* tag 'mvebu-arm64-4.7-1' of git://git.infradead.org/linux-mvebu:
MAINTAINERS: update entry for Marvell ARM platform maintainers
arm64: marvell: enable AP806 and CP110 syscon driver
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cb3582f460e7..c58557432b62 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1316,7 +1316,7 @@ ARM/MAGICIAN MACHINE SUPPORT M: Philipp Zabel <philipp.zabel@gmail.com> S: Maintained -ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support +ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support M: Jason Cooper <jason@lakedaemon.net> M: Andrew Lunn <andrew@lunn.ch> M: Gregory Clement <gregory.clement@free-electrons.com> |