From: Joe Perches <joe@perches.com>
Date: Mon, 26 Oct 2009 23:49:43 +0000 (-0700)
Subject: MAINTAINERS: update Kernel Janitors after mismerge
X-Git-Tag: v2.6.32-rc6~99
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=ee709b0c62bd163fd3b5aff2320e8724cd8e3d8b

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>