aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-05-15 11:13:06 -0400
committerArnd Bergmann <arnd@arndb.de>2015-05-15 11:13:06 -0400
commitcc1c1b5d21899f9ceec7d5434421f97a03c7d0fa (patch)
treeb8fbadf2679010267620247083b4f49c65fb2e35 /MAINTAINERS
parente8f98457587b8a11121ea0da6b6fe995a136e8fa (diff)
parent31c17ac98fc005c0998f890094eb8fe17061e667 (diff)
Merge tag 'mvebu-fixes-4.1-2' of git://git.infradead.org/linux-mvebu into fixes
Merge "mvebu fixes for 4.1 (part 2)" from Gregory CLEMENT: Fix the main PLL frequency on Armada 375, 38x and 39x SoCs Add clock-names to CuBox Si5351 clk generator Add dts entries in the MAINTAINERS file * tag 'mvebu-fixes-4.1-2' of git://git.infradead.org/linux-mvebu: MAINTAINERS: Add dts entries for some of the Marvell SoCs ARM: dove: Add clock-names to CuBox Si5351 clk generator ARM: mvebu: Fix the main PLL frequency on Armada 375, 38x and 39x SoCs
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 9 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 67b456d7c451..892b2cf0b42e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1193,7 +1193,7 @@ ARM/MAGICIAN MACHINE SUPPORT
1193M: Philipp Zabel <philipp.zabel@gmail.com> 1193M: Philipp Zabel <philipp.zabel@gmail.com>
1194S: Maintained 1194S: Maintained
1195 1195
1196ARM/Marvell Armada 370 and Armada XP SOC support 1196ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support
1197M: Jason Cooper <jason@lakedaemon.net> 1197M: Jason Cooper <jason@lakedaemon.net>
1198M: Andrew Lunn <andrew@lunn.ch> 1198M: Andrew Lunn <andrew@lunn.ch>
1199M: Gregory Clement <gregory.clement@free-electrons.com> 1199M: Gregory Clement <gregory.clement@free-electrons.com>
@@ -1202,12 +1202,17 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1202S: Maintained 1202S: Maintained
1203F: arch/arm/mach-mvebu/ 1203F: arch/arm/mach-mvebu/
1204F: drivers/rtc/rtc-armada38x.c 1204F: drivers/rtc/rtc-armada38x.c
1205F: arch/arm/boot/dts/armada*
1206F: arch/arm/boot/dts/kirkwood*
1207
1205 1208
1206ARM/Marvell Berlin SoC support 1209ARM/Marvell Berlin SoC support
1207M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 1210M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
1208L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1211L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1209S: Maintained 1212S: Maintained
1210F: arch/arm/mach-berlin/ 1213F: arch/arm/mach-berlin/
1214F: arch/arm/boot/dts/berlin*
1215
1211 1216
1212ARM/Marvell Dove/MV78xx0/Orion SOC support 1217ARM/Marvell Dove/MV78xx0/Orion SOC support
1213M: Jason Cooper <jason@lakedaemon.net> 1218M: Jason Cooper <jason@lakedaemon.net>
@@ -1220,6 +1225,9 @@ F: arch/arm/mach-dove/
1220F: arch/arm/mach-mv78xx0/ 1225F: arch/arm/mach-mv78xx0/
1221F: arch/arm/mach-orion5x/ 1226F: arch/arm/mach-orion5x/
1222F: arch/arm/plat-orion/ 1227F: arch/arm/plat-orion/
1228F: arch/arm/boot/dts/dove*
1229F: arch/arm/boot/dts/orion5x*
1230
1223 1231
1224ARM/Orion SoC/Technologic Systems TS-78xx platform support 1232ARM/Orion SoC/Technologic Systems TS-78xx platform support
1225M: Alexander Clouter <alex@digriz.org.uk> 1233M: Alexander Clouter <alex@digriz.org.uk>