diff --git a/[refs] b/[refs] index a437457164a1..3f1b5b6a21ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c5efc1778387de98d5348666e7bc4396c9a5404 +refs/heads/master: 91821ff3f958c16bf84d02258dd79da792c66ca8 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 2340cfb1e25d..17524afa7475 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2141,6 +2141,15 @@ L: isdn4linux@listserv.isdn4linux.de W: http://www.melware.de S: Maintained +IVTV VIDEO4LINUX DRIVER +P: Hans Verkuil +M: hverkuil@xs4all.nl +L: ivtv-devel@ivtvdriver.org +L: ivtv-users@ivtvdriver.org +L: video4linux-list@redhat.com +W: http://www.ivtvdriver.org +S: Maintained + JOURNALLING FLASH FILE SYSTEM V2 (JFFS2) P: David Woodhouse M: dwmw2@infradead.org