summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJisheng Zhang <Jisheng.Zhang@synaptics.com>2018-03-29 23:02:11 -0400
committerArnd Bergmann <arnd@arndb.de>2018-04-05 05:08:03 -0400
commitbc52497a595d2246923749177d99e4216703b0f4 (patch)
treeaae234a0f96e61ece6a404c9015be052f3b4f28c /MAINTAINERS
parent03de3727b25059d9802d1baac319ba40c035eade (diff)
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>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS18
1 files changed, 9 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index cc5f70e746b4..14b877f08654 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1556,15 +1556,6 @@ ARM/MAGICIAN MACHINE SUPPORT
1556M: Philipp Zabel <philipp.zabel@gmail.com> 1556M: Philipp Zabel <philipp.zabel@gmail.com>
1557S: Maintained 1557S: Maintained
1558 1558
1559ARM/Marvell Berlin SoC support
1560M: Jisheng Zhang <jszhang@marvell.com>
1561M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
1562L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1563S: Maintained
1564F: arch/arm/mach-berlin/
1565F: arch/arm/boot/dts/berlin*
1566F: arch/arm64/boot/dts/marvell/berlin*
1567
1568ARM/Marvell Dove/MV78xx0/Orion SOC support 1559ARM/Marvell Dove/MV78xx0/Orion SOC support
1569M: Jason Cooper <jason@lakedaemon.net> 1560M: Jason Cooper <jason@lakedaemon.net>
1570M: Andrew Lunn <andrew@lunn.ch> 1561M: Andrew Lunn <andrew@lunn.ch>
@@ -2027,6 +2018,15 @@ F: arch/arm/boot/dts/stm32*
2027F: arch/arm/mach-stm32/ 2018F: arch/arm/mach-stm32/
2028F: drivers/clocksource/armv7m_systick.c 2019F: drivers/clocksource/armv7m_systick.c
2029 2020
2021ARM/Synaptics Berlin SoC support
2022M: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
2023M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
2024L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2025S: Maintained
2026F: arch/arm/mach-berlin/
2027F: arch/arm/boot/dts/berlin*
2028F: arch/arm64/boot/dts/marvell/berlin*
2029
2030ARM/TANGO ARCHITECTURE 2030ARM/TANGO ARCHITECTURE
2031M: Marc Gonzalez <marc.w.gonzalez@free.fr> 2031M: Marc Gonzalez <marc.w.gonzalez@free.fr>
2032M: Mans Rullgard <mans@mansr.com> 2032M: Mans Rullgard <mans@mansr.com>