diff options
author | Jisheng Zhang <Jisheng.Zhang@synaptics.com> | 2018-03-29 23:02:11 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-04-05 05:08:03 -0400 |
commit | bc52497a595d2246923749177d99e4216703b0f4 (patch) | |
tree | aae234a0f96e61ece6a404c9015be052f3b4f28c /MAINTAINERS | |
parent | 03de3727b25059d9802d1baac319ba40c035eade (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-- | MAINTAINERS | 18 |
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 | |||
1556 | M: Philipp Zabel <philipp.zabel@gmail.com> | 1556 | M: Philipp Zabel <philipp.zabel@gmail.com> |
1557 | S: Maintained | 1557 | S: Maintained |
1558 | 1558 | ||
1559 | ARM/Marvell Berlin SoC support | ||
1560 | M: Jisheng Zhang <jszhang@marvell.com> | ||
1561 | M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | ||
1562 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
1563 | S: Maintained | ||
1564 | F: arch/arm/mach-berlin/ | ||
1565 | F: arch/arm/boot/dts/berlin* | ||
1566 | F: arch/arm64/boot/dts/marvell/berlin* | ||
1567 | |||
1568 | ARM/Marvell Dove/MV78xx0/Orion SOC support | 1559 | ARM/Marvell Dove/MV78xx0/Orion SOC support |
1569 | M: Jason Cooper <jason@lakedaemon.net> | 1560 | M: Jason Cooper <jason@lakedaemon.net> |
1570 | M: Andrew Lunn <andrew@lunn.ch> | 1561 | M: Andrew Lunn <andrew@lunn.ch> |
@@ -2027,6 +2018,15 @@ F: arch/arm/boot/dts/stm32* | |||
2027 | F: arch/arm/mach-stm32/ | 2018 | F: arch/arm/mach-stm32/ |
2028 | F: drivers/clocksource/armv7m_systick.c | 2019 | F: drivers/clocksource/armv7m_systick.c |
2029 | 2020 | ||
2021 | ARM/Synaptics Berlin SoC support | ||
2022 | M: Jisheng Zhang <Jisheng.Zhang@synaptics.com> | ||
2023 | M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | ||
2024 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
2025 | S: Maintained | ||
2026 | F: arch/arm/mach-berlin/ | ||
2027 | F: arch/arm/boot/dts/berlin* | ||
2028 | F: arch/arm64/boot/dts/marvell/berlin* | ||
2029 | |||
2030 | ARM/TANGO ARCHITECTURE | 2030 | ARM/TANGO ARCHITECTURE |
2031 | M: Marc Gonzalez <marc.w.gonzalez@free.fr> | 2031 | M: Marc Gonzalez <marc.w.gonzalez@free.fr> |
2032 | M: Mans Rullgard <mans@mansr.com> | 2032 | M: Mans Rullgard <mans@mansr.com> |