diff --git a/[refs] b/[refs] index f82efeba10e1..160a6b007fe5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a7643159d0faf839529f5001737b996d53760d9 +refs/heads/master: beb91d461ba19c47ce42a8ff5b3e5be39be10473 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index bfeb23507e8c..7f6dec5bed2d 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -7128,6 +7128,17 @@ W: http://linuxtv.org S: Odd Fixes F: drivers/media/radio/radio-si4713.h +SIANO DVB 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/common/siano/ +F: drivers/media/dvb/siano/ +F: drivers/media/usb/siano/ +F: drivers/media/mmc/siano + SH_VEU V4L2 MEM2MEM DRIVER M: Guennadi Liakhovetski L: linux-media@vger.kernel.org