---

yaml --- r: 341664 b: refs/heads/master c: ba57b6f h: refs/heads/master v: v3
git-mirror · Nov 30, 2012 · dae1e4c · dae1e4c
1 parent 7864055
commit dae1e4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b052e0737593c2a9c9b5f984e19e99f45435ef75
+refs/heads/master: ba57b6f20429028127618230b74d55e8eb9cfce3
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -7454,8 +7454,7 @@ S:	Maintained
 F:	drivers/net/ethernet/dec/tulip/
 
 TUN/TAP driver
-M:	Maxim Krasnyansky <maxk@qualcomm.com>
-L:	vtun@office.satix.net
+M:	Maxim Krasnyansky <maxk@qti.qualcomm.com>
 W:	http://vtun.sourceforge.net/tun
 S:	Maintained
 F:	Documentation/networking/tuntap.txt