diff --git a/[refs] b/[refs] index 98d397a36391..33b47e243909 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0dcb953a6eeae84566fe288d507aed49ead4cc6e +refs/heads/master: 402f6ae4d52e5f6c0fe053f307c18360f69e0132 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 8396b9cd3894..de6ec85035ee 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2367,6 +2367,16 @@ W: http://www.cyclades.com/ S: Orphan F: drivers/net/wan/pc300* +CYPRESS_FIRMWARE MEDIA DRIVER +M: Antti Palosaari +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/common/cypress_firmware* + CYTTSP TOUCHSCREEN DRIVER M: Javier Martinez Canillas L: linux-input@vger.kernel.org @@ -2731,16 +2741,6 @@ T: git git://linuxtv.org/media_tree.git S: Maintained F: drivers/media/usb/dvb-usb/cxusb* -DVB_USB_CYPRESS_FIRMWARE MEDIA DRIVER -M: Antti Palosaari -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/dvb-usb-v2/cypress_firmware* - DVB_USB_EC168 MEDIA DRIVER M: Antti Palosaari L: linux-media@vger.kernel.org