summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-06-01 16:59:55 -0700
committerOlof Johansson <olof@lixom.net>2017-06-01 17:07:40 -0700
commitc883af2f2bd1139f4d102cbebc3d66ea447ca08a (patch)
tree9fb57b7dc377576bfc73084036eb8257b756d97f /MAINTAINERS
parent1ba2eaaacd2cb3e3e0d753d62dae515c6dec8035 (diff)
parent1cb0b57fec06a616d98deaeda1924f8e45e1e4de (diff)
downloadlinux-c883af2f2bd1139f4d102cbebc3d66ea447ca08a.tar.gz
linux-c883af2f2bd1139f4d102cbebc3d66ea447ca08a.tar.bz2
linux-c883af2f2bd1139f4d102cbebc3d66ea447ca08a.zip
Merge tag 'mvebu-fixes-non-critical-4.12-1' of git://git.infradead.org/linux-mvebu into fixes
mvebu non critical fixes for 4.12 Update MAINTAINER file for irqchip related drivers to Marvell EBU * tag 'mvebu-fixes-non-critical-4.12-1' of git://git.infradead.org/linux-mvebu: MAINTAINERS: add irqchip related drivers to Marvell EBU maintainers MAINTAINERS: sort F entries for Marvell EBU maintainers Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 5 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ef1fe4ed3a0c..9d74be0789e4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1489,13 +1489,15 @@ M: Gregory Clement <gregory.clement@free-electrons.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-mvebu/
-F: drivers/rtc/rtc-armada38x.c
F: arch/arm/boot/dts/armada*
F: arch/arm/boot/dts/kirkwood*
+F: arch/arm/configs/mvebu_*_defconfig
+F: arch/arm/mach-mvebu/
F: arch/arm64/boot/dts/marvell/armada*
F: drivers/cpufreq/mvebu-cpufreq.c
-F: arch/arm/configs/mvebu_*_defconfig
+F: drivers/irqchip/irq-armada-370-xp.c
+F: drivers/irqchip/irq-mvebu-*
+F: drivers/rtc/rtc-armada38x.c
ARM/Marvell Berlin SoC support
M: Jisheng Zhang <jszhang@marvell.com>