diff --git a/[refs] b/[refs] index 75e8ec887c52..2fdf14be8d25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a500a185462d08f63ec3c8a0ba3185d1b84cb85d +refs/heads/master: b618b69c108b4fa792ff3dfe1ea95eeca7bc6af8 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index c4f8cf91c0db..7cea7ea606c7 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6867,6 +6867,20 @@ F: drivers/media/radio/si470x/radio-si470x-common.c F: drivers/media/radio/si470x/radio-si470x.h F: drivers/media/radio/si470x/radio-si470x-usb.c +SH_VEU V4L2 MEM2MEM DRIVER +M: Guennadi Liakhovetski +L: linux-media@vger.kernel.org +S: Maintained +F: drivers/media/platform/sh_veu.c +F: include/media/sh_veu.h + +SH_VOU V4L2 OUTPUT DRIVER +M: Guennadi Liakhovetski +L: linux-media@vger.kernel.org +S: Maintained +F: drivers/media/platform/sh_vou.c +F: include/media/sh_vou.h + SIMPLE FIRMWARE INTERFACE (SFI) M: Len Brown L: sfi-devel@simplefirmware.org