diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 12:10:38 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 12:10:38 +1000 |
| commit | 8bd00c47f0fea10b3172df8eb9ac55cea117104b (patch) | |
| tree | ffe521da83346edab7fd03b3c909ce5e21934863 /MAINTAINERS | |
| parent | ec12b0c29ab9c3eaa147da0f4df3f30b067a47fd (diff) | |
| parent | 07178d53d61f6ea04dd3d994badad9605cfca957 (diff) | |
Merge remote-tracking branch 'v4l-dvb/master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5dfdb4bfec45..3b5ee1b06c08 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -514,6 +514,16 @@ S: Supported F: fs/aio.c F: include/linux/*aio*.h +AIRSPY MEDIA DRIVER +M: Antti Palosaari <crope@iki.fi> +L: linux-media@vger.kernel.org +W: http://linuxtv.org/ +W: http://palosaari.fi/linux/ +Q: http://patchwork.linuxtv.org/project/linux-media/list/ +T: git git://linuxtv.org/anttip/media_tree.git +S: Maintained +F: drivers/media/usb/airspy/ + ALCATEL SPEEDTOUCH USB DRIVER M: Duncan Sands <duncan.sands@free.fr> L: linux-usb@vger.kernel.org @@ -5973,9 +5983,9 @@ W: http://palosaari.fi/linux/ Q: http://patchwork.linuxtv.org/project/linux-media/list/ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained -F: drivers/staging/media/msi3101/msi001* +F: drivers/media/tuners/msi001* -MSI3101 MEDIA DRIVER +MSI2500 MEDIA DRIVER M: Antti Palosaari <crope@iki.fi> L: linux-media@vger.kernel.org W: http://linuxtv.org/ @@ -5983,7 +5993,7 @@ W: http://palosaari.fi/linux/ Q: http://patchwork.linuxtv.org/project/linux-media/list/ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained -F: drivers/staging/media/msi3101/sdr-msi3101* +F: drivers/media/usb/msi2500/ MT9M032 APTINA SENSOR DRIVER M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> @@ -6507,11 +6517,12 @@ L: linux-omap@vger.kernel.org S: Maintained F: arch/arm/mach-omap2/omap_hwmod_44xx_data.c -OMAP IMAGE SIGNAL PROCESSOR (ISP) +OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS) M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> L: linux-media@vger.kernel.org S: Maintained F: drivers/media/platform/omap3isp/ +F: drivers/staging/media/omap4iss/ OMAP USB SUPPORT M: Felipe Balbi <balbi@ti.com> @@ -7620,7 +7631,7 @@ W: http://palosaari.fi/linux/ Q: http://patchwork.linuxtv.org/project/linux-media/list/ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained -F: drivers/staging/media/rtl2832u_sdr/rtl2832_sdr* +F: drivers/media/dvb-frontends/rtl2832_sdr* RTL8180 WIRELESS DRIVER M: "John W. Linville" <linville@tuxdriver.com> @@ -9563,15 +9574,6 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/usb/smsc95xx.* -USB SN9C1xx DRIVER -M: Luca Risolia <luca.risolia@studio.unibo.it> -L: linux-usb@vger.kernel.org -L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git -W: http://www.linux-projects.org -S: Maintained -F: drivers/staging/media/sn9c102/ - USB SUBSYSTEM M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> L: linux-usb@vger.kernel.org |