Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 75a9a5fc230acde24280a584bc7f8af994b677c7..3b5fe0c09c2389362eda5ef7c8ad833376000a38 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1405,7 +1405,7 @@ F:        net/ax25/
 B43 WIRELESS DRIVER
 M:     Stefano Brivio <[email protected]>
 L:     [email protected]
-L:     [email protected] (moderated for non-subscribers)
+L:     [email protected]
 W:     http://linuxwireless.org/en/users/Drivers/b43
 S:     Maintained
 F:     drivers/net/wireless/b43/
@@ -1414,6 +1414,7 @@ B43LEGACY WIRELESS DRIVER
 M:     Larry Finger <[email protected]>
 M:     Stefano Brivio <[email protected]>
 L:     [email protected]
+L:     [email protected]
 W:     http://linuxwireless.org/en/users/Drivers/b43
 S:     Maintained
 F:     drivers/net/wireless/b43legacy/
@@ -1797,7 +1798,8 @@ F:        Documentation/zh_CN/
 CISCO VIC ETHERNET NIC DRIVER
 M:     Christian Benvenuti <[email protected]>
 M:     Roopa Prabhu <[email protected]>
-M:     David Wang <[email protected]>
+M:     Neel Patel <[email protected]>
+M:     Nishank Trivedi <[email protected]>
 S:     Supported
 F:     drivers/net/ethernet/cisco/enic/
 
@@ -4910,8 +4912,6 @@ F:        fs/ocfs2/
 
 ORINOCO DRIVER
 L:     [email protected]
-L:     [email protected]
-L:     [email protected]
 W:     http://linuxwireless.org/en/users/Drivers/orinoco
 W:     http://www.nongnu.org/orinoco/
 S:     Orphan
@@ -7458,6 +7458,12 @@ S:       Supported
 F:     Documentation/filesystems/xfs.txt
 F:     fs/xfs/
 
+XILINX AXI ETHERNET DRIVER
+M:     Ariane Keller <[email protected]>
+M:     Daniel Borkmann <[email protected]>
+S:     Maintained
+F:     drivers/net/ethernet/xilinx/xilinx_axienet*
+
 XILINX SYSTEMACE DRIVER
 M:     Grant Likely <[email protected]>
 W:     http://www.secretlab.ca/