Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc52497a authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Arnd Bergmann
Browse files

MAINTAINERS: update entry for ARM/berlin

Synaptics has acquired the Multimedia Solutions Business of Marvell[1].
So change the berlin entry name and move it to its alphabetical
location. We move to ARM/Synaptics instead of ARM/Marvell.

This patch also updates my email address from marvell to synaptics.

[1] https://www.synaptics.com/company/news/conexant-marvell



Signed-off-by: default avatarJisheng Zhang <Jisheng.Zhang@synaptics.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 03de3727
Loading
Loading
Loading
Loading
+9 −9
Original line number Diff line number Diff line
@@ -1556,15 +1556,6 @@ ARM/MAGICIAN MACHINE SUPPORT
M:	Philipp Zabel <philipp.zabel@gmail.com>
S:	Maintained

ARM/Marvell Berlin SoC support
M:	Jisheng Zhang <jszhang@marvell.com>
M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	arch/arm/mach-berlin/
F:	arch/arm/boot/dts/berlin*
F:	arch/arm64/boot/dts/marvell/berlin*

ARM/Marvell Dove/MV78xx0/Orion SOC support
M:	Jason Cooper <jason@lakedaemon.net>
M:	Andrew Lunn <andrew@lunn.ch>
@@ -2027,6 +2018,15 @@ F: arch/arm/boot/dts/stm32*
F:	arch/arm/mach-stm32/
F:	drivers/clocksource/armv7m_systick.c

ARM/Synaptics Berlin SoC support
M:	Jisheng Zhang <Jisheng.Zhang@synaptics.com>
M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	arch/arm/mach-berlin/
F:	arch/arm/boot/dts/berlin*
F:	arch/arm64/boot/dts/marvell/berlin*

ARM/TANGO ARCHITECTURE
M:	Marc Gonzalez <marc.w.gonzalez@free.fr>
M:	Mans Rullgard <mans@mansr.com>