diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 11:13:06 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 11:13:06 -0400 |
commit | cc1c1b5d21899f9ceec7d5434421f97a03c7d0fa (patch) | |
tree | b8fbadf2679010267620247083b4f49c65fb2e35 /MAINTAINERS | |
parent | e8f98457587b8a11121ea0da6b6fe995a136e8fa (diff) | |
parent | 31c17ac98fc005c0998f890094eb8fe17061e667 (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-- | MAINTAINERS | 10 |
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 | |||
1193 | M: Philipp Zabel <philipp.zabel@gmail.com> | 1193 | M: Philipp Zabel <philipp.zabel@gmail.com> |
1194 | S: Maintained | 1194 | S: Maintained |
1195 | 1195 | ||
1196 | ARM/Marvell Armada 370 and Armada XP SOC support | 1196 | ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support |
1197 | M: Jason Cooper <jason@lakedaemon.net> | 1197 | M: Jason Cooper <jason@lakedaemon.net> |
1198 | M: Andrew Lunn <andrew@lunn.ch> | 1198 | M: Andrew Lunn <andrew@lunn.ch> |
1199 | M: Gregory Clement <gregory.clement@free-electrons.com> | 1199 | M: Gregory Clement <gregory.clement@free-electrons.com> |
@@ -1202,12 +1202,17 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | |||
1202 | S: Maintained | 1202 | S: Maintained |
1203 | F: arch/arm/mach-mvebu/ | 1203 | F: arch/arm/mach-mvebu/ |
1204 | F: drivers/rtc/rtc-armada38x.c | 1204 | F: drivers/rtc/rtc-armada38x.c |
1205 | F: arch/arm/boot/dts/armada* | ||
1206 | F: arch/arm/boot/dts/kirkwood* | ||
1207 | |||
1205 | 1208 | ||
1206 | ARM/Marvell Berlin SoC support | 1209 | ARM/Marvell Berlin SoC support |
1207 | M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 1210 | M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> |
1208 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 1211 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
1209 | S: Maintained | 1212 | S: Maintained |
1210 | F: arch/arm/mach-berlin/ | 1213 | F: arch/arm/mach-berlin/ |
1214 | F: arch/arm/boot/dts/berlin* | ||
1215 | |||
1211 | 1216 | ||
1212 | ARM/Marvell Dove/MV78xx0/Orion SOC support | 1217 | ARM/Marvell Dove/MV78xx0/Orion SOC support |
1213 | M: Jason Cooper <jason@lakedaemon.net> | 1218 | M: Jason Cooper <jason@lakedaemon.net> |
@@ -1220,6 +1225,9 @@ F: arch/arm/mach-dove/ | |||
1220 | F: arch/arm/mach-mv78xx0/ | 1225 | F: arch/arm/mach-mv78xx0/ |
1221 | F: arch/arm/mach-orion5x/ | 1226 | F: arch/arm/mach-orion5x/ |
1222 | F: arch/arm/plat-orion/ | 1227 | F: arch/arm/plat-orion/ |
1228 | F: arch/arm/boot/dts/dove* | ||
1229 | F: arch/arm/boot/dts/orion5x* | ||
1230 | |||
1223 | 1231 | ||
1224 | ARM/Orion SoC/Technologic Systems TS-78xx platform support | 1232 | ARM/Orion SoC/Technologic Systems TS-78xx platform support |
1225 | M: Alexander Clouter <alex@digriz.org.uk> | 1233 | M: Alexander Clouter <alex@digriz.org.uk> |