Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 017bf493166e7877b1e8607324be674c9737efe2..9ddb5ac923cd07db93d0a5f0af49d2035d45f33c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1142,7 +1142,7 @@ ATLX ETHERNET DRIVERS
 M:     Jay Cliburn <jcliburn@gmail.com>
 M:     Chris Snook <chris.snook@gmail.com>
 M:     Jie Yang <jie.yang@atheros.com>
-L:     atl1-devel@lists.sourceforge.net
+L:     netdev@vger.kernel.org
 W:     http://sourceforge.net/projects/atl1
 W:     http://atl1.sourceforge.net
 S:     Maintained
@@ -1567,9 +1567,9 @@ S:        Supported
 F:     scripts/checkpatch.pl
 
 CISCO VIC ETHERNET NIC DRIVER
-M:     Scott Feldman <scofeldm@cisco.com>
 M:     Vasanthy Kolluri <vkolluri@cisco.com>
 M:     Roopa Prabhu <roprabhu@cisco.com>
+M:     David Wang <dwang2@cisco.com>
 S:     Supported
 F:     drivers/net/enic/