diff --git a/[refs] b/[refs] index 367def8f210f..2e0c540ade79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c30701130cf7bff4f97a148b1bc96f878c046a40 +refs/heads/master: e76e4706cf9051e4db12c3d4418fcfbb053fc463 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 29801f760b6f..63be58b2891f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6720,6 +6720,15 @@ S: Maintained F: Documentation/filesystems/vfat.txt F: fs/fat/ +VIDEOBUF2 FRAMEWORK +M: Pawel Osciak +M: Marek Szyprowski +M: Kyungmin Park +L: linux-media@vger.kernel.org +S: Maintained +F: drivers/media/video/videobuf2-* +F: include/media/videobuf2-* + VIRTIO CONSOLE DRIVER M: Amit Shah L: virtualization@lists.linux-foundation.org