summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-01-29 17:36:44 -0800
committerOlof Johansson <olof@lixom.net>2017-01-29 17:36:44 -0800
commit4b35ba1108517ccda8a484876e69dd9ea78e9570 (patch)
tree8483513366d159d4d765668dbcd8249786cd421e /MAINTAINERS
parentf2d53a8f6e8045ff5978156e41d00d0f7166d0fe (diff)
parentd9bd264596b9ec364990ab64c8cc1792586425e3 (diff)
downloadlinux-4b35ba1108517ccda8a484876e69dd9ea78e9570.tar.gz
linux-4b35ba1108517ccda8a484876e69dd9ea78e9570.tar.bz2
linux-4b35ba1108517ccda8a484876e69dd9ea78e9570.zip
Merge tag 'pxa-for-4.11' of https://github.com/rjarzmik/linux into next/soc
This is the pxa changes for v4.11 cycle. This cycle is a minor fixes one, covering : - build fixes from Arnd, mainly include related - transfer of maintainance of Motorala phone to Robert * tag 'pxa-for-4.11' of https://github.com/rjarzmik/linux: MAINTAINERS: transfer maintainership for the EZX platform ARM: pxa: include linux/leds.h ARM: pxa: ezx: fix a910 camera data Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 2 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5e92f5500729..e14de9a21235 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1227,13 +1227,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