1 files changed, 206 insertions, 4 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 4e2a1f67a1fc..376117d5518d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -464,6 +464,14 @@ S:	Maintained
 F:      drivers/scsi/aic7xxx/
 F:      drivers/scsi/aic7xxx_old/
 
+AIMSLAB FM RADIO RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-aimslab*
+
 AIO
 M:      Benjamin LaHaise <bcrl@kvack.org>
 L:      linux-aio@kvack.org
@@ -558,6 +566,18 @@ L:	linux-rdma@vger.kernel.org
 S:      Maintained
 F:      drivers/infiniband/hw/amso1100/
 
+ANALOG DEVICES INC AD9389B DRIVER
+M:      Hans Verkuil <hans.verkuil@cisco.com>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/i2c/ad9389b*
+
+ANALOG DEVICES INC ADV7604 DRIVER
+M:      Hans Verkuil <hans.verkuil@cisco.com>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/i2c/adv7604*
+
 ANALOG DEVICES INC ASOC CODEC DRIVERS
 M:      Lars-Peter Clausen <lars@metafoo.de>
 L:      device-drivers-devel@blackfin.uclinux.org
@@ -1119,6 +1139,14 @@ F:	arch/arm/mach-s5pv210/mach-goni.c
 F:      arch/arm/mach-exynos/mach-universal_c210.c
 F:      arch/arm/mach-exynos/mach-nuri.c
 
+ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
+M:      Kyungmin Park <kyungmin.park@samsung.com>
+M:      Kamil Debski <k.debski@samsung.com>
+L:      linux-arm-kernel@lists.infradead.org
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/platform/s5p-g2d/
+
 ARM/SAMSUNG S5P SERIES FIMC SUPPORT
 M:      Kyungmin Park <kyungmin.park@samsung.com>
 M:      Sylwester Nawrocki <s.nawrocki@samsung.com>
@@ -1412,7 +1440,7 @@ ATMEL ISI DRIVER
 M:      Josh Wu <josh.wu@atmel.com>
 L:      linux-media@vger.kernel.org
 S:      Supported
-F:      drivers/media/platform/atmel-isi.c
+F:      drivers/media/platform/soc_camera/atmel-isi.c
 F:      include/media/atmel-isi.h
 
 ATMEL LCDFB DRIVER
@@ -1509,6 +1537,14 @@ T:	git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      drivers/media/usb/dvb-usb-v2/az6007.c
 
+AZTECH FM RADIO RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-aztech*
+
 B43 WIRELESS DRIVER
 M:      Stefano Brivio <stefano.brivio@polimi.it>
 L:      linux-wireless@vger.kernel.org
@@ -1790,6 +1826,14 @@ S:	Supported
 F:      Documentation/filesystems/caching/cachefiles.txt
 F:      fs/cachefiles/
 
+CADET FM/AM RADIO RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-cadet*
+
 CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
 M:      Jonathan Corbet <corbet@lwn.net>
 L:      linux-media@vger.kernel.org
@@ -2187,6 +2231,15 @@ F:	Documentation/video4linux/cx18.txt
 F:      drivers/media/pci/cx18/
 F:      include/uapi/linux/ivtv*
 
+CX2341X MPEG ENCODER HELPER MODULE
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/i2c/cx2341x*
+F:      include/media/cx2341x*
+
 CX88 VIDEO4LINUX DRIVER
 M:      Mauro Carvalho Chehab <mchehab@redhat.com>
 L:      linux-media@vger.kernel.org
@@ -2558,6 +2611,13 @@ S:	Maintained
 F:      drivers/gpu/drm/tegra/
 F:      Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
 
+DSBR100 USB FM RADIO DRIVER
+M:      Alexey Klimov <klimov.linux@gmail.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/radio/dsbr100.c
+
 DSCC4 DRIVER
 M:      Francois Romieu <romieu@fr.zoreil.com>
 L:      netdev@vger.kernel.org
@@ -2622,7 +2682,7 @@ W:	http://github.com/mkrufky
 Q:      http://patchwork.linuxtv.org/project/linux-media/list/
 T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
-F:      drivers/media/usb/dvb-usb-v2/cxusb*
+F:      drivers/media/usb/dvb-usb/cxusb*
 
 DVB_USB_CYPRESS_FIRMWARE MEDIA DRIVER
 M:      Antti Palosaari <crope@iki.fi>
@@ -3319,6 +3379,14 @@ W:	http://www.icp-vortex.com/
 S:      Supported
 F:      drivers/scsi/gdt*
 
+GEMTEK FM RADIO RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-gemtek*
+
 GENERIC GPIO I2C DRIVER
 M:      Haavard Skinnemoen <hskinnemoen@gmail.com>
 S:      Supported
@@ -4202,6 +4270,14 @@ F:	Documentation/isapnp.txt
 F:      drivers/pnp/isapnp/
 F:      include/linux/isapnp.h
 
+ISA RADIO MODULE
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-isa*
+
 iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
 M:      Peter Jones <pjones@redhat.com>
 M:      Konrad Rzeszutek Wilk <konrad@kernel.org>
@@ -4358,6 +4434,14 @@ W:	http://lse.sourceforge.net/kdump/
 S:      Maintained
 F:      Documentation/kdump/
 
+KEENE FM RADIO TRANSMITTER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-keene*
+
 KERNEL AUTOMOUNTER v4 (AUTOFS4)
 M:      Ian Kent <raven@themaw.net>
 L:      autofs@vger.kernel.org
@@ -4831,6 +4915,13 @@ Q:	http://patchwork.linuxtv.org/project/linux-media/list/
 S:      Maintained
 F:      drivers/media/dvb-frontends/m88rs2000*
 
+MA901 MASTERKIT USB FM RADIO DRIVER
+M:      Alexey Klimov <klimov.linux@gmail.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/radio/radio-ma901.c
+
 MAC80211
 M:      Johannes Berg <johannes@sipsolutions.net>
 L:      linux-wireless@vger.kernel.org
@@ -4928,6 +5019,14 @@ S:	Maintained
 F:      Documentation/hwmon/max6650
 F:      drivers/hwmon/max6650.c
 
+MAXIRADIO FM RADIO RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-maxiradio*
+
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 M:      Mauro Carvalho Chehab <mchehab@redhat.com>
 P:      LinuxTV.org Project
@@ -4950,6 +5049,14 @@ F:	include/uapi/linux/meye.h
 F:      include/uapi/linux/ivtv*
 F:      include/uapi/linux/uvcvideo.h
 
+MEDIAVISION PRO MOVIE STUDIO DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Odd Fixes
+F:      drivers/media/parport/pms*
+
 MEGARAID SCSI DRIVERS
 M:      Neela Syam Kolli <megaraidlinux@lsi.com>
 L:      linux-scsi@vger.kernel.org
@@ -5019,6 +5126,14 @@ S:	Supported
 F:      Documentation/mips/
 F:      arch/mips/
 
+MIROSOUND PCM20 FM RADIO RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Odd Fixes
+F:      drivers/media/radio/radio-miropcm20*
+
 MODULE SUPPORT
 M:      Rusty Russell <rusty@rustcorp.com.au>
 S:      Maintained
@@ -6198,6 +6313,14 @@ L:	linux-hexagon@vger.kernel.org
 S:      Supported
 F:      arch/hexagon/
 
+QUICKCAM PARALLEL PORT WEBCAMS
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Odd Fixes
+F:      drivers/media/parport/*-qcam*
+
 RADOS BLOCK DEVICE (RBD)
 M:      Yehuda Sadeh <yehuda@inktank.com>
 M:      Sage Weil <sage@inktank.com>
@@ -6471,6 +6594,14 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Supported
 F:      drivers/mmc/host/s3cmci.*
 
+SAA6588 RDS RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Odd Fixes
+F:      drivers/media/i2c/saa6588*
+
 SAA7134 VIDEO4LINUX DRIVER
 M:      Mauro Carvalho Chehab <mchehab@redhat.com>
 L:      linux-media@vger.kernel.org
@@ -6481,10 +6612,9 @@ F:	Documentation/video4linux/saa7134/
 F:      drivers/media/pci/saa7134/
 
 SAA7146 VIDEO4LINUX-2 DRIVER
-M:      Michael Hunold <michael@mihu.de>
+M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:      linux-media@vger.kernel.org
 T:      git git://linuxtv.org/media_tree.git
-W:      http://www.mihu.de/linux/saa7146
 S:      Maintained
 F:      drivers/media/common/saa7146/
 F:      drivers/media/pci/saa7146/
@@ -6783,6 +6913,38 @@ M:	Robin Holt <holt@sgi.com>
 S:      Maintained
 F:      drivers/misc/sgi-xp/
 
+SI470X FM RADIO RECEIVER I2C DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Odd Fixes
+F:      drivers/media/radio/si470x/radio-si470x-i2c.c
+
+SI470X FM RADIO RECEIVER USB DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/si470x/radio-si470x-common.c
+F:      drivers/media/radio/si470x/radio-si470x.h
+F:      drivers/media/radio/si470x/radio-si470x-usb.c
+
+SH_VEU V4L2 MEM2MEM DRIVER
+M:      Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/platform/sh_veu.c
+F:      include/media/sh_veu.h
+
+SH_VOU V4L2 OUTPUT DRIVER
+M:      Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/platform/sh_vou.c
+F:      include/media/sh_vou.h
+
 SIMPLE FIRMWARE INTERFACE (SFI)
 M:      Len Brown <lenb@kernel.org>
 L:      sfi-devel@simplefirmware.org
@@ -7455,6 +7617,14 @@ T:	git git://linuxtv.org/mkrufky/tuners.git
 S:      Maintained
 F:      drivers/media/tuners/tda8290.*
 
+TDA9840 MEDIA DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/i2c/tda9840*
+
 TEA5761 TUNER DRIVER
 M:      Mauro Carvalho Chehab <mchehab@redhat.com>
 L:      linux-media@vger.kernel.org
@@ -7471,6 +7641,22 @@ T:	git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      drivers/media/tuners/tea5767.*
 
+TEA6415C MEDIA DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/i2c/tea6415c*
+
+TEA6420 MEDIA DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/i2c/tea6420*
+
 TEAM DRIVER
 M:      Jiri Pirko <jpirko@redhat.com>
 L:      netdev@vger.kernel.org
@@ -8087,6 +8273,14 @@ S:	Maintained
 F:      drivers/media/usb/uvc/
 F:      include/uapi/linux/uvcvideo.h
 
+USB VISION DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Odd Fixes
+F:      drivers/media/usb/usbvision/
+
 USB WEBCAM GADGET
 M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:      linux-usb@vger.kernel.org
@@ -8234,6 +8428,14 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ethernet/via/via-velocity.*
 
+VIVI VIRTUAL VIDEO DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/platform/vivi*
+
 VLAN (802.1Q)
 M:      Patrick McHardy <kaber@trash.net>
 L:      netdev@vger.kernel.org