diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-29 17:38:04 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-29 17:38:04 -0800 |
| commit | 7ffb7c86c3f45d90e33715812e43611f20824998 (patch) | |
| tree | edde978a1b9619aa062e8fbe1a0d0243fab57f49 /MAINTAINERS | |
| parent | 54934c1726528b3728b128cee94b8e13ed1c49e6 (diff) | |
| parent | 4b35ba1108517ccda8a484876e69dd9ea78e9570 (diff) | |
Merge branch 'next/soc' into for-next
* next/soc:
MAINTAINERS: transfer maintainership for the EZX platform
ARM: OMAP: clock: Remove unused mpurate cmdline option
ARM: OMAP2+: omap_hwmod: Add support for earlycon
arm: hisi: drop extern hip01_cpu_die
ARM: pxa: include linux/leds.h
ARM: pxa: ezx: fix a910 camera data
MAINTAINERS: Add Aaro Koskinen as TI omap1 SoC co-maintainer
ARM: OMAP1: USB: delete redundant CPU class checks
ARM: OMAP1: USB: make omap_otg_init() static
ARM: OMAP1: USB: tidy up logging output
ARM: OMAP2+: Make the omapdss_find_dss_of_node() function static
ARM: OMAP2+: Remove unused omap_display_init() function
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c4e627a240aa..4dc8bfe1e33f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1228,13 +1228,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 @@ -8936,7 +8932,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/ @@ -8944,8 +8953,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 |