X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=MAINTAINERS;h=db3d0f5061f9c42e301e420878b0dc5cbe31e6e1;hb=84d4db0e22965334ae8272f324d31fb4657465aa;hp=7642365ed6d263b7189eecd143c787a5058b6b9b;hpb=c01ec7b1ea61b1c7febfe09d7751a4d916194aaf;p=net-next-2.6.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 7642365ed6d..db3d0f5061f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2111,11 +2111,20 @@ F:	drivers/edac/i5000_edac.c
 
 EDAC-I5400
 M:	Mauro Carvalho Chehab <mchehab@redhat.com>
-L:	bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:	linux-edac@vger.kernel.org
 W:	bluesmoke.sourceforge.net
 S:	Maintained
 F:	drivers/edac/i5400_edac.c
 
+EDAC-I7CORE
+M:	Mauro Carvalho Chehab <mchehab@redhat.com>
+L:	linux-edac@vger.kernel.org
+W:	bluesmoke.sourceforge.net
+S:	Maintained
+F:	drivers/edac/i7core_edac.c
+F:	drivers/edac/edac_mce.c
+F:	include/linux/edac_mce.h
+
 EDAC-I82975X
 M:	Ranganathan Desikan <ravi@jetztechnologies.com>
 M:	"Arvind R." <arvind@jetztechnologies.com>
@@ -5327,6 +5336,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 S:	Maintained
 F:	arch/sparc/
+F:	drivers/sbus
 
 SPARC SERIAL DRIVERS
 M:	"David S. Miller" <davem@davemloft.net>