Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[mirror_ubuntu-bionic-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 76dfb51f7fa5fa6d555c1334384bdf660f5dad30..c4caa9bb7689f9b1a899381435af8e76b21d6eaa 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1234,13 +1234,9 @@ S:       Maintained
 N:     efm32
 
 ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
-M:     Daniel Ribeiro <drwyrm@gmail.com>
-M:     Stefan Schmidt <stefan@openezx.org>
-M:     Harald Welte <laforge@openezx.org>
-L:     openezx-devel@lists.openezx.org (moderated for non-subscribers)
-W:     http://www.openezx.org/
+M:     Robert Jarzmik <robert.jarzmik@free.fr>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-T:     topgit git://git.openezx.org/openezx.git
 F:     arch/arm/mach-pxa/ezx.c
 
 ARM/FARADAY FA526 PORT
@@ -2641,7 +2637,7 @@ 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
+T:     git git://github.com/anholt/linux
 S:     Maintained
 N:     bcm2835
 F:     drivers/staging/vc04_services
@@ -9023,7 +9019,20 @@ M:       Josh Poimboeuf <jpoimboe@redhat.com>
 S:     Supported
 F:     tools/objtool/
 
-OMAP SUPPORT
+OMAP1 SUPPORT
+M:     Aaro Koskinen <aaro.koskinen@iki.fi>
+M:     Tony Lindgren <tony@atomide.com>
+L:     linux-omap@vger.kernel.org
+Q:     http://patchwork.kernel.org/project/linux-omap/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
+S:     Maintained
+F:     arch/arm/mach-omap1/
+F:     arch/arm/plat-omap/
+F:     arch/arm/configs/omap1_defconfig
+F:     drivers/i2c/busses/i2c-omap.c
+F:     include/linux/i2c-omap.h
+
+OMAP2+ SUPPORT
 M:     Tony Lindgren <tony@atomide.com>
 L:     linux-omap@vger.kernel.org
 W:     http://www.muru.com/linux/omap/
@@ -9031,8 +9040,8 @@ W:        http://linux.omap.com/
 Q:     http://patchwork.kernel.org/project/linux-omap/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
 S:     Maintained
-F:     arch/arm/*omap*/
-F:     arch/arm/configs/omap1_defconfig
+F:     arch/arm/mach-omap2/
+F:     arch/arm/plat-omap/
 F:     arch/arm/configs/omap2plus_defconfig
 F:     drivers/i2c/busses/i2c-omap.c
 F:     drivers/irqchip/irq-omap-intc.c