diff --git a/[refs] b/[refs]
index e499d1ee8cf1..90af6d87cbcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b052e0737593c2a9c9b5f984e19e99f45435ef75
+refs/heads/master: ba57b6f20429028127618230b74d55e8eb9cfce3
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 5d72dd57b78a..13f472188e32 100644
--- 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