Merge tag 'media/v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mcheh...

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b0543c223f6ac323063014fe1481b644d2e8d4b1..1c453f9cce817651706f5582661afa8d1b618be3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1956,6 +1956,14 @@ M:       Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
+ARM/TEGRA HDMI CEC SUBSYSTEM SUPPORT
+M:     Hans Verkuil <hans.verkuil@cisco.com>
+L:     linux-tegra@vger.kernel.org
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/platform/tegra-cec/
+F:     Documentation/devicetree/bindings/media/tegra-cec.txt
+
 ARM/TETON BGA MACHINE SUPPORT
 M:     "Mark F. Brown" <mark.brown314@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -3264,6 +3272,15 @@ F:       include/uapi/linux/cec.h
 F:     include/uapi/linux/cec-funcs.h
 F:     Documentation/devicetree/bindings/media/cec.txt
 
+CEC GPIO DRIVER
+M:     Hans Verkuil <hans.verkuil@cisco.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+W:     http://linuxtv.org
+S:     Supported
+F:     drivers/media/platform/cec-gpio/
+F:     Documentation/devicetree/bindings/media/cec-gpio.txt
+
 CELL BROADBAND ENGINE ARCHITECTURE
 M:     Arnd Bergmann <arnd@arndb.de>
 L:     linuxppc-dev@lists.ozlabs.org
@@ -11572,6 +11589,13 @@ F:     drivers/hid/hid-roccat*
 F:     include/linux/hid-roccat*
 F:     Documentation/ABI/*/sysfs-driver-hid-roccat*
 
+ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
+M:     Jacob chen <jacob2.chen@rock-chips.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/platform/rockchip/rga/
+F:     Documentation/devicetree/bindings/media/rockchip-rga.txt
+
 ROCKER DRIVER
 M:     Jiri Pirko <jiri@resnulli.us>
 L:     netdev@vger.kernel.org
@@ -12721,6 +12745,13 @@ L:     stable@vger.kernel.org
 S:     Supported
 F:     Documentation/process/stable-kernel-rules.rst
 
+STAGING - ATOMISP DRIVER
+M:     Alan Cox <alan@linux.intel.com>
+M:     Sakari Ailus <sakari.ailus@linux.intel.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/media/atomisp/
+
 STAGING - COMEDI
 M:     Ian Abbott <abbotti@mev.co.uk>
 M:     H Hartley Sweeten <hsweeten@visionengravers.com>