diff --git a/[refs] b/[refs] index 5bd889a09c84..9e07f1730204 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f96236e585e2ba0e746c12dee79b54bc121d688b +refs/heads/master: 203575784987e37c4bba36aad05d88da8bfe2da1 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 124c44c3cbb7..c9d66a6694be 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2151,6 +2151,15 @@ S: Maintained F: Documentation/video4linux/cx18.txt F: drivers/media/pci/cx18/ +CX88 VIDEO4LINUX DRIVER +M: Mauro Carvalho Chehab +L: linux-media@vger.kernel.org +W: http://linuxtv.org +T: git git://linuxtv.org/media_tree.git +S: Odd fixes +F: Documentation/video4linux/cx88/ +F: drivers/media/pci/cx88/ + CXD2820R MEDIA DRIVER M: Antti Palosaari L: linux-media@vger.kernel.org