From ae6bbd0c94611710356facac956cea2b98ba2197 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 23 Nov 2012 08:21:50 -0300 Subject: [PATCH] --- yaml --- r: 356987 b: refs/heads/master c: 0b7bc1faa0663c22c3e9abde1bc1cce0c0541eb4 h: refs/heads/master i: 356985: c90bdb35ad367d11b06ad0d1793c0cbff5d783c4 356983: f68b3bcbc5aa8e06de6f4e8715d34bb0f63604ee v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 807f715e1322..5a3e6c833fe1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b60b9c45a2c1f5874f31d55e7f50e7ab3329d1b0 +refs/heads/master: 0b7bc1faa0663c22c3e9abde1bc1cce0c0541eb4 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index b6dd66438420..9d07ad6d1cf2 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -8280,6 +8280,14 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/via/via-velocity.* +VIVI VIRTUAL VIDEO DRIVER +M: Hans Verkuil +L: linux-media@vger.kernel.org +T: git git://linuxtv.org/media_tree.git +W: http://linuxtv.org +S: Maintained +F: drivers/media/platform/vivi* + VLAN (802.1Q) M: Patrick McHardy L: netdev@vger.kernel.org