diff --git a/[refs] b/[refs] index e2698e4f355f..f7f77dfab654 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d95d8158b5ab51339f8482c98c01469c45ff6d7 +refs/heads/master: 67c8931677090540e31b4f816e5fe315ff51f262 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6d119c98b89b..6084655152d5 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2109,11 +2109,18 @@ F: drivers/edac/i5000_edac.c EDAC-I5400 M: Mauro Carvalho Chehab -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 +L: linux-edac@vger.kernel.org +W: bluesmoke.sourceforge.net +S: Maintained +F: drivers/edac/i7core_edac.c linux/edac_mce.h drivers/edac/edac_mce.c + EDAC-I82975X M: Ranganathan Desikan M: "Arvind R."