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: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index cc5f70e746b4f6fcb34b7eed4c8babda74377434..14b877f08654dcc30938527add74c57d8b3a5652 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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>