summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-12 16:39:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-12 16:39:22 -0700
commitb0e0c9e7f6d5764633e93944dafd896dd6097318 (patch)
tree668d9adb29cb566f6240e7bc51faaf564d3241ca /MAINTAINERS
parentdae816835e8d1276c9e50d9c4dba75b7705fe66c (diff)
parent53e6d8d182e97c5211da4ee1f163c840c7ecf8ca (diff)
downloadop-kernel-dev-b0e0c9e7f6d5764633e93944dafd896dd6097318.zip
op-kernel-dev-b0e0c9e7f6d5764633e93944dafd896dd6097318.tar.gz
Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.27' of git://linux-nfs.org/~bfields/linux: fs/nfsd/export.c: Adjust error handling code involving auth_domain_put MAINTAINERS: mention lockd and sunrpc in nfs entries lockd: trivial sparse endian annotations
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b343814..af6aa4e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2462,7 +2462,7 @@ L: kernel-janitors@vger.kernel.org
W: http://www.kerneljanitors.org/
S: Maintained
-KERNEL NFSD
+KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
P: J. Bruce Fields
M: bfields@fieldses.org
P: Neil Brown
@@ -3078,7 +3078,7 @@ M: ja@ssi.bg
L: netdev@vger.kernel.org
S: Maintained
-NFS CLIENT
+NFS, SUNRPC, AND LOCKD CLIENTS
P: Trond Myklebust
M: Trond.Myklebust@netapp.com
L: linux-nfs@vger.kernel.org
OpenPOWER on IntegriCloud