diff --git a/[refs] b/[refs] index 061028b43a70..f0d6cec4e2e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5560983b5dc29f50c91336ddc8769e9b90f62651 +refs/heads/master: 27a0aacf3ee4e7f91b95d69c954a6ba6540a5c0a diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 1a7438bcb83c..bbe872e5ac65 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6713,6 +6713,16 @@ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained F: drivers/media/dvb-frontends/rtl2830* +RTL2832 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/dvb-frontends/rtl2832* + RTL8180 WIRELESS DRIVER M: "John W. Linville" L: linux-wireless@vger.kernel.org