Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0e265fc..69aa8fe 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2212,6 +2212,13 @@ W:       bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i5400_edac.c
 
+EDAC-I7300
+M:     Mauro Carvalho Chehab <mchehab@redhat.com>
+L:     linux-edac@vger.kernel.org
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+F:     drivers/edac/i7300_edac.c
+
 EDAC-I7CORE
 M:     Mauro Carvalho Chehab <mchehab@redhat.com>
 L:     linux-edac@vger.kernel.org
@@ -3434,7 +3441,7 @@ F:        scripts/package/
 
 KERNEL JANITORS
 L:     kernel-janitors@vger.kernel.org
-W:     http://janitor.kernelnewbies.org/
+W:     http://kernelnewbies.org/KernelJanitors
 S:     Odd Fixes
 
 KERNEL NFSD, SUNRPC, AND LOCKD SERVERS