Merge branches 'for-4.3/upstream-fixes', 'for-4.4/corsair', 'for-4.4/dragonrise'...

[mirror_ubuntu-artful-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 963233fc721bc37d49c626e11d650c728ff3120e..248b46b223b6a388bc0b57de0a84ed362a6f42c6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1471,9 +1471,7 @@ F:        arch/arm/boot/dts/emev2*
 F:     arch/arm/boot/dts/r7s*
 F:     arch/arm/boot/dts/r8a*
 F:     arch/arm/boot/dts/sh*
-F:     arch/arm/configs/armadillo800eva_defconfig
 F:     arch/arm/configs/bockw_defconfig
-F:     arch/arm/configs/kzm9g_defconfig
 F:     arch/arm/configs/marzen_defconfig
 F:     arch/arm/configs/shmobile_defconfig
 F:     arch/arm/include/debug/renesas-scif.S
@@ -1585,7 +1583,10 @@ ARM/UNIPHIER ARCHITECTURE
 M:     Masahiro Yamada <yamada.masahiro@socionext.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
+F:     arch/arm/boot/dts/uniphier*
 F:     arch/arm/mach-uniphier/
+F:     drivers/pinctrl/uniphier/
+F:     drivers/tty/serial/8250/8250_uniphier.c
 N:     uniphier
 
 ARM/Ux500 ARM ARCHITECTURE
@@ -1680,7 +1681,7 @@ M:        Michal Simek <michal.simek@xilinx.com>
 R:     Sören Brinkmann <soren.brinkmann@xilinx.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://wiki.xilinx.com
-T:     git git://git.xilinx.com/linux-xlnx.git
+T:     git https://github.com/Xilinx/linux-xlnx.git
 S:     Supported
 F:     arch/arm/mach-zynq/
 F:     drivers/cpuidle/cpuidle-zynq.c
@@ -2224,7 +2225,9 @@ F:        drivers/clocksource/bcm_kona_timer.c
 BROADCOM BCM2835 ARM ARCHITECTURE
 M:     Stephen Warren <swarren@wwwdotorg.org>
 M:     Lee Jones <lee@kernel.org>
+M:     Eric Anholt <eric@anholt.net>
 L:     linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
 S:     Maintained
 N:     bcm2835
@@ -8610,6 +8613,7 @@ M:        Philipp Zabel <p.zabel@pengutronix.de>
 S:     Maintained
 F:     drivers/reset/
 F:     Documentation/devicetree/bindings/reset/
+F:     include/dt-bindings/reset/
 F:     include/linux/reset.h
 F:     include/linux/reset-controller.h
 
@@ -9911,8 +9915,9 @@ SYNOPSYS ARC ARCHITECTURE
 M:     Vineet Gupta <vgupta@synopsys.com>
 S:     Supported
 F:     arch/arc/
-F:     Documentation/devicetree/bindings/arc/
+F:     Documentation/devicetree/bindings/arc/*
 F:     drivers/tty/serial/arc_uart.c
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
 
 SYNOPSYS ARC SDP platform support
 M:     Alexey Brodkin <abrodkin@synopsys.com>