vhost-net: skip head management if no outstanding

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9087e0d6f1a7bdcb31cdb4144c39095eb72987cb..e443eb76ce5e93ce932905016de39f8e971e4521 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4822,6 +4822,14 @@ F:       Documentation/scsi/megaraid.txt
 F:     drivers/scsi/megaraid.*
 F:     drivers/scsi/megaraid/
 
+MELLANOX ETHERNET DRIVER (mlx4_en)
+M:     Amir Vadai <amirv@mellanox.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+W:     http://www.mellanox.com
+Q:     http://patchwork.ozlabs.org/project/netdev/list/
+F:     drivers/net/ethernet/mellanox/mlx4/en_*
+
 MEMORY MANAGEMENT
 L:     linux-mm@kvack.org
 W:     http://www.linux-mm.org
@@ -5157,6 +5165,7 @@ F:        net/nfc/
 F:     include/linux/nfc.h
 F:     include/net/nfc/
 F:     drivers/nfc/
+F:     include/linux/platform_data/pn544.h
 
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:     Trond Myklebust <Trond.Myklebust@netapp.com>
@@ -7453,8 +7462,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