aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-10-26 16:49:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 07:39:26 -0700
commitee709b0c62bd163fd3b5aff2320e8724cd8e3d8b (patch)
tree790776b1add6cf402fb083a0065a11040232097e /MAINTAINERS
parent7a241d6ecd3ffbe5aa987176fc4466250ff3ed3b (diff)
downloadkernel_samsung_aries-ee709b0c62bd163fd3b5aff2320e8724cd8e3d8b.zip
kernel_samsung_aries-ee709b0c62bd163fd3b5aff2320e8724cd8e3d8b.tar.gz
kernel_samsung_aries-ee709b0c62bd163fd3b5aff2320e8724cd8e3d8b.tar.bz2
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>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
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>