Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 32f4f05fb3da8b608066ea3d11af191275a21f56..dd39fc578607ab34f2c0159d53dc8d07e3f3275c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -649,6 +649,12 @@ M: Lino Sanfilippo <LinoSanfilippo@gmx.de>
 S:     Maintained
 F:     drivers/net/ethernet/alacritech/*
 
+FORCEDETH GIGABIT ETHERNET DRIVER
+M:     Rain River <rain.1986.08.12@gmail.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/nvidia/*
+
 ALCATEL SPEEDTOUCH USB DRIVER
 M:     Duncan Sands <duncan.sands@free.fr>
 L:     linux-usb@vger.kernel.org
@@ -17673,7 +17679,7 @@ F:      Documentation/ABI/testing/sysfs-hypervisor-xen
 
 XEN NETWORK BACKEND DRIVER
 M:     Wei Liu <wei.liu@kernel.org>
-M:     Paul Durrant <paul.durrant@citrix.com>
+M:     Paul Durrant <paul@xen.org>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 L:     netdev@vger.kernel.org
 S:     Supported