diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-14 12:26:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-14 12:26:41 -0800 |
| commit | 0b48d42235caf627121f440b57d376f48a9af8b6 (patch) | |
| tree | 400967c5fcb1cd08bbc0e1739e229f9717590f19 /MAINTAINERS | |
| parent | 8e63dd6e1c589ba99a18df9cbaa41c3178607641 (diff) | |
| parent | 7a6ef8c72314f254c107c6a9ed7cb201961ee05a (diff) | |
| download | linux-0b48d42235caf627121f440b57d376f48a9af8b6.tar.gz linux-0b48d42235caf627121f440b57d376f48a9af8b6.tar.bz2 linux-0b48d42235caf627121f440b57d376f48a9af8b6.zip | |
Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux
* 'for-3.3' of git://linux-nfs.org/~bfields/linux: (31 commits)
nfsd4: nfsd4_create_clid_dir return value is unused
NFSD: Change name of extended attribute containing junction
svcrpc: don't revert to SVC_POOL_DEFAULT on nfsd shutdown
svcrpc: fix double-free on shutdown of nfsd after changing pool mode
nfsd4: be forgiving in the absence of the recovery directory
nfsd4: fix spurious 4.1 post-reboot failures
NFSD: forget_delegations should use list_for_each_entry_safe
NFSD: Only reinitilize the recall_lru list under the recall lock
nfsd4: initialize special stateid's at compile time
NFSd: use network-namespace-aware cache registering routines
SUNRPC: create svc_xprt in proper network namespace
svcrpc: update outdated BKL comment
nfsd41: allow non-reclaim open-by-fh's in 4.1
svcrpc: avoid memory-corruption on pool shutdown
svcrpc: destroy server sockets all at once
svcrpc: make svc_delete_xprt static
nfsd: Fix oops when parsing a 0 length export
nfsd4: Use kmemdup rather than duplicating its implementation
nfsd4: add a separate (lockowner, inode) lookup
nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7559c1ca56ba..4d1ba2022a95 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3775,7 +3775,6 @@ S: Odd Fixes KERNEL NFSD, SUNRPC, AND LOCKD SERVERS M: "J. Bruce Fields" <bfields@fieldses.org> -M: Neil Brown <neilb@suse.de> L: linux-nfs@vger.kernel.org W: http://nfs.sourceforge.net/ S: Supported |