summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2011-10-27 23:40:00 +0200
committerJ. Bruce Fields <bfields@redhat.com>2011-11-08 03:10:46 +0100
commitf8e6defe7f4456d8700e5a3796a1e9fb54a88543 (patch)
tree3cae9da6a3b0520dc7dc909ee70d899bc6ecfe36
parentLinux 3.2-rc1 (diff)
downloadlinux-f8e6defe7f4456d8700e5a3796a1e9fb54a88543.tar.xz
linux-f8e6defe7f4456d8700e5a3796a1e9fb54a88543.zip
Update NFSD MAINTAINER
Neil hasn't really been at all active as a maintainer for some years now. So move his maintainership to CREDITS Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--CREDITS5
-rw-r--r--MAINTAINERS1
2 files changed, 5 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 07e32a87d956..557da475bc9c 100644
--- a/CREDITS
+++ b/CREDITS
@@ -514,6 +514,11 @@ S: Bessemerstraat 21
S: Amsterdam
S: The Netherlands
+N: NeilBrown
+E: neil@brown.name
+P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F 497A 39EC 9EDD 5662 81B9
+D: NFSD Maintainer 2000-2007
+
N: Zach Brown
E: zab@zabbo.net
D: maestro pci sound
diff --git a/MAINTAINERS b/MAINTAINERS
index 4808256446f2..6ab923d15853 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3770,7 +3770,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