diff --git a/[refs] b/[refs] index 2fdf11948e46..8a94e5796715 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 124a02c9b44a5faa3373a92388aa00290a76a0b7 +refs/heads/master: 4d096ca7e65584dd5845e64c6400f920e694f672 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 1544cc8cf2db..14070ab3fc6b 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2432,6 +2432,13 @@ W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/r82600_edac.c +EDAC-SBRIDGE +M: Mauro Carvalho Chehab +L: linux-edac@vger.kernel.org +W: bluesmoke.sourceforge.net +S: Maintained +F: drivers/edac/sb_edac.c + EDIROL UA-101/UA-1000 DRIVER M: Clemens Ladisch L: alsa-devel@alsa-project.org (moderated for non-subscribers)