Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9507b42075128b4072e0c834218c644546bde116..cdc2198db754f4e65a35da6a338adfe658d7258f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2751,8 +2751,10 @@ S:       Maintained
 
 NFS CLIENT
 P:     Trond Myklebust
-M:     trond.myklebust@fys.uio.no
-L:     linux-kernel@vger.kernel.org
+M:     Trond.Myklebust@netapp.com
+L:     linux-nfs@vger.kernel.org
+W:     http://client.linux-nfs.org
+T:     git git://git.linux-nfs.org/pub/linux/nfs-2.6.git
 S:     Maintained
 
 NI5010 NETWORK DRIVER
@@ -3699,11 +3701,6 @@ M:       nagar@watson.ibm.com
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
-TI PARALLEL LINK CABLE DRIVER
-P:     Romain Lievin
-M:     roms@lpg.ticalc.org
-S:     Maintained
-
 TIPC NETWORK LAYER
 P:     Per Liden
 M:     per.liden@ericsson.com