diff --git a/[refs] b/[refs] index e834c35cdbb3..061028b43a70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbcd371b46a16a81a9975b57a11b61bbc2ba81e4 +refs/heads/master: 5560983b5dc29f50c91336ddc8769e9b90f62651 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4252aa4faf92..1a7438bcb83c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2751,6 +2751,15 @@ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained F: drivers/media/usb/dvb-usb-v2/ec168* +DVB_USB_GL861 MEDIA DRIVER +M: Antti Palosaari +L: linux-media@vger.kernel.org +W: http://linuxtv.org/ +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/gl861* + DVB_USB_MXL111SF MEDIA DRIVER M: Michael Krufky L: linux-media@vger.kernel.org