diff --git a/[refs] b/[refs] index c667a42153c6..f0c3b61aa09c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 055616a89387ab3e67084e682df9ae95aa291804 +refs/heads/master: d099dea2c84e9be681891997b4864b5d6a018bf4 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 9ba5febc3d4e..1a4d7dd89ec1 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2559,6 +2559,16 @@ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained F: drivers/media/usb/dvb-usb-v2/ce6230* +DVB_USB_CXUSB MEDIA DRIVER +M: Michael Krufky +L: linux-media@vger.kernel.org +W: http://linuxtv.org/ +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* + DVB_USB_CYPRESS_FIRMWARE MEDIA DRIVER M: Antti Palosaari L: linux-media@vger.kernel.org