diff --git a/[refs] b/[refs] index 76bdf8ee9ac0..4643f9e2aba3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 889b2f8783ee533ffe4117b0a7173319dec86ac8 +refs/heads/master: 8d4b3f08a80c90a4366e1b6d2e99b2b00d1871f2 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index d6c017b8909e..588bcc4ec2f2 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6663,6 +6663,18 @@ S: Supported F: arch/arm/mach-davinci F: drivers/i2c/busses/i2c-davinci.c +TI DAVINCI SERIES MEDIA DRIVER +M: Manjunath Hadli +M: Prabhakar Lad +L: linux-media@vger.kernel.org +L: davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers) +W: http://linuxtv.org/ +Q: http://patchwork.linuxtv.org/project/linux-media/list/ +T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git +S: Supported +F: drivers/media/platform/davinci/ +F: include/media/davinci/ + SIS 190 ETHERNET DRIVER M: Francois Romieu L: netdev@vger.kernel.org