Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[~shefty/rdma-dev.git] / MAINTAINERS
index 7ffaf79d90f7f592df4c66226b927c726d0f81ed..cdb8fe8b6182f25cf509cefa5817be0156b6d188 100644 (file)
@@ -2982,11 +2982,6 @@ S:       Maintained
 F:     include/linux/netfilter_bridge/
 F:     net/bridge/
 
-ETHERTEAM 16I DRIVER
-M:     Mika Kuoppala <miku@iki.fi>
-S:     Maintained
-F:     drivers/net/ethernet/fujitsu/eth16i.c
-
 EXT2 FILE SYSTEM
 M:     Jan Kara <jack@suse.cz>
 L:     linux-ext4@vger.kernel.org
@@ -5385,13 +5380,6 @@ F:       include/linux/sunrpc/
 F:     include/uapi/linux/nfs*
 F:     include/uapi/linux/sunrpc/
 
-NI5010 NETWORK DRIVER
-M:     Jan-Pascal van Best <janpascal@vanbest.org>
-M:     Andreas Mohr <andi@lisas.de>
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     drivers/net/ethernet/racal/ni5010.*
-
 NILFS2 FILESYSTEM
 M:     KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
 L:     linux-nilfs@vger.kernel.org
@@ -7544,7 +7532,7 @@ S:        Maintained
 F:     drivers/media/tuners/tea5767.*
 
 TEAM DRIVER
-M:     Jiri Pirko <jpirko@redhat.com>
+M:     Jiri Pirko <jiri@resnulli.us>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/team/