diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 19:39:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 19:39:22 -0400 |
| commit | b0e0c9e7f6d5764633e93944dafd896dd6097318 (patch) | |
| tree | 668d9adb29cb566f6240e7bc51faaf564d3241ca /MAINTAINERS | |
| parent | dae816835e8d1276c9e50d9c4dba75b7705fe66c (diff) | |
| parent | 53e6d8d182e97c5211da4ee1f163c840c7ecf8ca (diff) | |
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-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b343814a1ace..af6aa4e4b392 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2462,7 +2462,7 @@ L: kernel-janitors@vger.kernel.org | |||
| 2462 | W: http://www.kerneljanitors.org/ | 2462 | W: http://www.kerneljanitors.org/ |
| 2463 | S: Maintained | 2463 | S: Maintained |
| 2464 | 2464 | ||
| 2465 | KERNEL NFSD | 2465 | KERNEL NFSD, SUNRPC, AND LOCKD SERVERS |
| 2466 | P: J. Bruce Fields | 2466 | P: J. Bruce Fields |
| 2467 | M: bfields@fieldses.org | 2467 | M: bfields@fieldses.org |
| 2468 | P: Neil Brown | 2468 | P: Neil Brown |
| @@ -3078,7 +3078,7 @@ M: ja@ssi.bg | |||
| 3078 | L: netdev@vger.kernel.org | 3078 | L: netdev@vger.kernel.org |
| 3079 | S: Maintained | 3079 | S: Maintained |
| 3080 | 3080 | ||
| 3081 | NFS CLIENT | 3081 | NFS, SUNRPC, AND LOCKD CLIENTS |
| 3082 | P: Trond Myklebust | 3082 | P: Trond Myklebust |
| 3083 | M: Trond.Myklebust@netapp.com | 3083 | M: Trond.Myklebust@netapp.com |
| 3084 | L: linux-nfs@vger.kernel.org | 3084 | L: linux-nfs@vger.kernel.org |