Merge tag 'chrome-platform-for-linus-4.13' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 01dffc0a9e1fcde81b2e50dcaa7deb2fec70b8f2..f6ec1be48609e14b12b752f2c3cb0ef4cf9df0c4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3319,9 +3319,10 @@ F:       Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
 F:     drivers/input/touchscreen/chipone_icn8318.c
 
 CHROME HARDWARE PLATFORM SUPPORT
+M:     Benson Leung <bleung@chromium.org>
 M:     Olof Johansson <olof@lixom.net>
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
 F:     drivers/platform/chrome/
 
 CISCO VIC ETHERNET NIC DRIVER
@@ -4304,6 +4305,12 @@ F:       include/drm/drm*
 F:     include/uapi/drm/drm*
 F:     include/linux/vga*
 
+DRM DRIVER FOR ARM PL111 CLCD
+M:     Eric Anholt <eric@anholt.net>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Supported
+F:     drivers/gpu/drm/pl111/
+
 DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
 M:     Dave Airlie <airlied@redhat.com>
 S:     Odd Fixes
@@ -4311,6 +4318,8 @@ F:        drivers/gpu/drm/ast/
 
 DRM DRIVERS FOR BRIDGE CHIPS
 M:     Archit Taneja <architt@codeaurora.org>
+M:     Andrzej Hajda <a.hajda@samsung.com>
+R:     Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
 S:     Maintained
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 F:     drivers/gpu/drm/bridge/
@@ -4567,6 +4576,17 @@ S:       Maintained
 F:     drivers/gpu/drm/sti
 F:     Documentation/devicetree/bindings/display/st,stih4xx.txt
 
+DRM DRIVERS FOR STM
+M:     Yannick Fertre <yannick.fertre@st.com>
+M:     Philippe Cornu <philippe.cornu@st.com>
+M:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
+M:     Vincent Abriou <vincent.abriou@st.com>
+L:     dri-devel@lists.freedesktop.org
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Maintained
+F:     drivers/gpu/drm/stm
+F:     Documentation/devicetree/bindings/display/st,stm32-ltdc.txt
+
 DRM DRIVER FOR TDFX VIDEO CARDS
 S:     Orphan / Obsolete
 F:     drivers/gpu/drm/tdfx/
@@ -10540,6 +10560,17 @@ W:     http://wireless.kernel.org/en/users/Drivers/p54
 S:     Obsolete
 F:     drivers/net/wireless/intersil/prism54/
 
+PROC SYSCTL
+M:     "Luis R. Rodriguez" <mcgrof@kernel.org>
+M:     Kees Cook <keescook@chromium.org>
+L:     linux-kernel@vger.kernel.org
+L:     linux-fsdevel@vger.kernel.org
+S:     Maintained
+F:     fs/proc/proc_sysctl.c
+F:     include/linux/sysctl.h
+F:     kernel/sysctl.c
+F:     tools/testing/selftests/sysctl/
+
 PS3 NETWORK SUPPORT
 M:     Geoff Levand <geoff@infradead.org>
 L:     netdev@vger.kernel.org