---

yaml --- r: 356987 b: refs/heads/master c: 0b7bc1f h: refs/heads/master i: 356985: c90bdb3 356983: f68b3bc v: v3
git-mirror · Dec 11, 2012 · ae6bbd0 · ae6bbd0
1 parent 9b3d64d
commit ae6bbd0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b60b9c45a2c1f5874f31d55e7f50e7ab3329d1b0
+refs/heads/master: 0b7bc1faa0663c22c3e9abde1bc1cce0c0541eb4
diff --git 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 <hverkuil@xs4all.nl>
+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 <kaber@trash.net>
 L:	netdev@vger.kernel.org