diff --git a/[refs] b/[refs] index dd1b61fdcedf..9b7dd25f1c2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 531fca1649dab3dff47ed2becd484b9cc020ea4e +refs/heads/master: 3f101d916b5b2b95d36369e1b2505720db2dcecb diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 34f4eb4fb490..c001ed68df19 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2195,6 +2195,15 @@ F: Documentation/video4linux/cx18.txt F: drivers/media/pci/cx18/ F: include/uapi/linux/ivtv* +CX2341X MPEG ENCODER HELPER MODULE +M: Hans Verkuil +L: linux-media@vger.kernel.org +T: git git://linuxtv.org/media_tree.git +W: http://linuxtv.org +S: Maintained +F: drivers/media/i2c/cx2341x* +F: include/media/cx2341x* + CX88 VIDEO4LINUX DRIVER M: Mauro Carvalho Chehab L: linux-media@vger.kernel.org