summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 13:36:17 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 13:36:17 -0800
commit2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde (patch)
treeafcc572acff2548cdabdfb0ec488508e1864daf1 /MAINTAINERS
parent23afc5c67588c92a062b4828a97b119755dffb51 (diff)
parent78f5815368837ae7e3a0d3709c9f95f74e4d8537 (diff)
downloadlinux-2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde.tar.gz
linux-2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde.tar.bz2
linux-2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde.zip
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6: MAINTAINERS: update the NFS CLIENT entry NFS: Fix an Oops in NFS unmount Revert "NFS: Ensure we return zero if applications attempt to write zero bytes" SUNRPC xprtrdma: fix XDR tail buf marshalling for all ops NFSv2/v3: Fix a memory leak when using -onolock NFS: Fix NFS mountpoint crossing...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a7caced39bfa..cdc2198db754 100644
--- 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