From 30c7469ba6f5eccf33ac33ec7cb19414f50cf3bf Mon Sep 17 00:00:00 2001 From: Johannes Thumshirn Date: Thu, 7 May 2015 10:21:24 +0200 Subject: MAINTAINERS: Change Johannes Thumshirn's email address Change my email address to something that is not associated with my current or future employer. Suggested-by: Borislav Petkov Signed-off-by: Johannes Thumshirn Cc: linux-edac Cc: linux-watchdog@vger.kernel.org Cc: Mauro Carvalho Chehab Cc: Wim Van Sebroeck Cc: Greg Kroah-Hartman Link: http://lkml.kernel.org/r/1430986884-8760-1-git-send-email-jthumshirn@suse.de Signed-off-by: Borislav Petkov --- MAINTAINERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 2e5bbc0d68b2..be68a7156f13 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3708,7 +3708,7 @@ S: Maintained F: drivers/edac/ie31200_edac.c EDAC-MPC85XX -M: Johannes Thumshirn +M: Johannes Thumshirn L: linux-edac@vger.kernel.org W: bluesmoke.sourceforge.net S: Maintained @@ -6388,14 +6388,14 @@ F: include/linux/mtd/ F: include/uapi/mtd/ MEN A21 WATCHDOG DRIVER -M: Johannes Thumshirn +M: Johannes Thumshirn L: linux-watchdog@vger.kernel.org -S: Supported +S: Maintained F: drivers/watchdog/mena21_wdt.c MEN CHAMELEON BUS (mcb) -M: Johannes Thumshirn -S: Supported +M: Johannes Thumshirn +S: Maintained F: drivers/mcb/ F: include/linux/mcb.h -- cgit v1.2.3 From 995e1de45af8ed5c841583a29f94f338f0bd50ba Mon Sep 17 00:00:00 2001 From: Loc Ho Date: Fri, 22 May 2015 17:32:57 -0600 Subject: MAINTAINERS: Add entry for APM X-Gene SoC EDAC driver Add a MAINTAINERS entry for APM X-Gene SoC EDAC driver. Signed-off-by: Loc Ho Cc: devicetree@vger.kernel.org Cc: dougthompson@xmission.com Cc: ijc+devicetree@hellion.org.uk Cc: jcm@redhat.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-edac Cc: mark.rutland@arm.com Cc: mchehab@osg.samsung.com Cc: patches@apm.com Cc: robh+dt@kernel.org Link: http://lkml.kernel.org/r/1432337580-3750-3-git-send-email-lho@apm.com Signed-off-by: Borislav Petkov --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index be68a7156f13..a51ec44f9711 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3735,6 +3735,13 @@ W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/sb_edac.c +EDAC-XGENE +APPLIED MICRO (APM) X-GENE SOC EDAC +M: Loc Ho +S: Supported +F: drivers/edac/xgene_edac.c +F: Documentation/devicetree/bindings/edac/apm-xgene-edac.txt + EDIROL UA-101/UA-1000 DRIVER M: Clemens Ladisch L: alsa-devel@alsa-project.org (moderated for non-subscribers) -- cgit v1.2.3