diff --git a/[refs] b/[refs] index e0d7626c646b..9dec8e7d39f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0319efe1fb7dde97573ad42bc12d795cb4bc398 +refs/heads/master: 45f95b53d4cb0fcfd546d3a015fbfe05f7eb591c diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 080d297c9790..541b5c6cd00f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -7322,6 +7322,14 @@ S: Maintained F: include/linux/shmem_fs.h F: mm/shmem.c +TM6000 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: drivers/media/usb/tm6000/ + TPM DEVICE DRIVER M: Kent Yoder M: Rajiv Andrade