summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-02-24 16:44:14 -0800
committerOlof Johansson <olof@lixom.net>2016-02-24 16:46:14 -0800
commitc74f162e845f4aa636c735398676b16640d9541d (patch)
treeb479bf2b53a8bbb3de2332455f8cd9624c381e33 /MAINTAINERS
parent8f4f2721ddc85a78e6a05c2d35953a351992d5dc (diff)
parente772ca05cceb1480bdc7a7579e042b18558d0959 (diff)
Merge tag 'mvebu-arm64-4.6-1' of git://git.infradead.org/linux-mvebu into next/arm64
mvebu arm64 for 4.6 (part 1) Non dt part of the Armada 3700 support: - Kconfig update - defconfig update - documentation update (including MAINTAINERS:) * tag 'mvebu-arm64-4.6-1' of git://git.infradead.org/linux-mvebu: arm64: defconfig: enable Armada 3700 related config Documentation: arm: update supported Marvell EBU processors MAINTAINERS: Extend dts entry for ARM64 mvebu files arm64: add mvebu architecture entry irqchip/armada-370-xp: Do not enable it by default when ARCH_MVEBU is selected ARM: mvebu: Use the ARMADA_370_XP_IRQ option irqchip/armada-370-xp: Allow allocation of multiple MSIs irqchip/armada-370-xp: Use shorter names for irq_chip irqchip/armada-370-xp: Use PCI_MSI_DOORBELL_START where appropriate irqchip/armada-370-xp: Use the generic MSI infrastructure irqchip/armada-370-xp: Add Kconfig option for the driver Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7f1fa4ff300a..a8b00b569305 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1278,6 +1278,7 @@ 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/arm64/boot/dts/marvell/armada*
ARM/Marvell Berlin SoC support