[PATCH V2] MAINTAINERS: Update Kernel Janitors after mismerge

From: Joe Perches
Date: Thu Sep 24 2009 - 19:07:31 EST


On Thu, 2009-09-24 at 14:42 -0700, akpm@xxxxxxxxxxxxxxxxxxxx wrote:
> The patch titled
> MAINTAINERS: JANITORS status set to Odd Fixes
> Subject: MAINTAINERS: JANITORS status set to Odd Fixes
> It was mistakenly reset to MAINTAINED after a fuzzy merge

This is a better patch.
It fixes the mismerge of the W: URL and the S: status fields.

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>

diff --git a/MAINTAINERS b/MAINTAINERS
index 0aa0776..ba70091 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2954,8 +2954,8 @@ F: scripts/Makefile.*

KERNEL JANITORS
L: kernel-janitors@xxxxxxxxxxxxxxx
-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@xxxxxxxxxxxx>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/