The following commit has been merged in the linux branch: commit ee709b0c62bd163fd3b5aff2320e8724cd8e3d8b Author: Joe Perches joe@perches.com Date: Mon Oct 26 16:49:43 2009 -0700

MAINTAINERS: update Kernel Janitors after mismerge

Fix the mismerge of the W: URL and the S: status fields.

Signed-off-by: Joe Perches joe@perches.com Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org

diff --git a/MAINTAINERS b/MAINTAINERS index 100b448..88dffb4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2991,8 +2991,8 @@ F: scripts/Makefile.*

KERNEL JANITORS L: kernel-janitors@vger.kernel.org -W: http://www.kerneljanitors.org/ -S: Maintained +W: http://janitor.kernelnewbies.org/ +S: Odd Fixes

KERNEL NFSD, SUNRPC, AND LOCKD SERVERS M: "J. Bruce Fields" bfields@fieldses.org