From c91d907596cc44e8206b707e6be80f5489db4f40 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Thu, 1 Sep 2016 14:55:45 +0200 Subject: EDAC, I3000: Orphan driver Apparently there's no hw left at Intel for testing patches and Jason is not going to maintain it anymore. Signed-off-by: Borislav Petkov --- CREDITS | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'CREDITS') diff --git a/CREDITS b/CREDITS index 2a3fbcd229e6..1d7c43f3361f 100644 --- a/CREDITS +++ b/CREDITS @@ -3654,6 +3654,10 @@ S: Obere Heerbergstrasse 17 S: 97078 Wuerzburg S: Germany +N: Jason Uhlenkott +E: juhlenko@akamai.com +D: I3000 EDAC driver + N: Greg Ungerer E: gerg@snapgear.com D: uClinux kernel hacker -- cgit v1.2.3-59-g8ed1b From 01f0c2164d4328fa45d054af0e3949dd3f472e30 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Thu, 8 Sep 2016 18:20:09 +0200 Subject: EDAC: Move Doug Thompson to CREDITS Doug hasn't been active as a maintainer for a long time now. Move him to CREDITS. Thanks for all the hard work, Doug! Signed-off-by: Borislav Petkov Cc: Doug Thompson Cc: Doug Thompson --- CREDITS | 4 ++++ MAINTAINERS | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'CREDITS') diff --git a/CREDITS b/CREDITS index 1d7c43f3361f..c3cbd1bbe3b0 100644 --- a/CREDITS +++ b/CREDITS @@ -3518,6 +3518,10 @@ S: 145 Howard St. S: Northborough, MA 01532 S: USA +N: Doug Thompson +E: dougthompson@xmission.com +D: EDAC + N: Tommy Thorn E: Tommy.Thorn@irisa.fr W: http://www.irisa.fr/prive/thorn/index.html diff --git a/MAINTAINERS b/MAINTAINERS index 13c6abeb451a..8350e19190bb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4393,7 +4393,6 @@ F: Documentation/filesystems/ecryptfs.txt F: fs/ecryptfs/ EDAC-CORE -M: Doug Thompson M: Borislav Petkov M: Mauro Carvalho Chehab M: Mauro Carvalho Chehab @@ -4406,14 +4405,12 @@ F: drivers/edac/ F: include/linux/edac.h EDAC-AMD64 -M: Doug Thompson M: Borislav Petkov L: linux-edac@vger.kernel.org S: Maintained F: drivers/edac/amd64_edac* EDAC-CALXEDA -M: Doug Thompson M: Robert Richter L: linux-edac@vger.kernel.org S: Maintained @@ -4429,13 +4426,11 @@ F: drivers/edac/octeon_edac* EDAC-E752X M: Mark Gross -M: Doug Thompson L: linux-edac@vger.kernel.org S: Maintained F: drivers/edac/e752x_edac.c EDAC-E7XXX -M: Doug Thompson L: linux-edac@vger.kernel.org S: Maintained F: drivers/edac/e7xxx_edac.c @@ -4459,7 +4454,6 @@ S: Orphan F: drivers/edac/i3000_edac.c EDAC-I5000 -M: Doug Thompson L: linux-edac@vger.kernel.org S: Maintained F: drivers/edac/i5000_edac.c -- cgit v1.2.3-59-g8ed1b