aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-09-08 12:20:09 -0400
committerBorislav Petkov <bp@suse.de>2016-09-09 13:25:29 -0400
commit01f0c2164d4328fa45d054af0e3949dd3f472e30 (patch)
treece31ec12db2c33c137f0e81c99d23ffa2e9fb5a0
parentc91d907596cc44e8206b707e6be80f5489db4f40 (diff)
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 <bp@suse.de> Cc: Doug Thompson <norsk5@yahoo.com> Cc: Doug Thompson <dougthompson@xmission.com>
-rw-r--r--CREDITS4
-rw-r--r--MAINTAINERS6
2 files changed, 4 insertions, 6 deletions
diff --git a/CREDITS b/CREDITS
index 1d7c43f3361f..c3cbd1bbe3b0 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3518,6 +3518,10 @@ S: 145 Howard St.
3518S: Northborough, MA 01532 3518S: Northborough, MA 01532
3519S: USA 3519S: USA
3520 3520
3521N: Doug Thompson
3522E: dougthompson@xmission.com
3523D: EDAC
3524
3521N: Tommy Thorn 3525N: Tommy Thorn
3522E: Tommy.Thorn@irisa.fr 3526E: Tommy.Thorn@irisa.fr
3523W: http://www.irisa.fr/prive/thorn/index.html 3527W: 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
4393F: fs/ecryptfs/ 4393F: fs/ecryptfs/
4394 4394
4395EDAC-CORE 4395EDAC-CORE
4396M: Doug Thompson <dougthompson@xmission.com>
4397M: Borislav Petkov <bp@alien8.de> 4396M: Borislav Petkov <bp@alien8.de>
4398M: Mauro Carvalho Chehab <mchehab@s-opensource.com> 4397M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
4399M: Mauro Carvalho Chehab <mchehab@kernel.org> 4398M: Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -4406,14 +4405,12 @@ F: drivers/edac/
4406F: include/linux/edac.h 4405F: include/linux/edac.h
4407 4406
4408EDAC-AMD64 4407EDAC-AMD64
4409M: Doug Thompson <dougthompson@xmission.com>
4410M: Borislav Petkov <bp@alien8.de> 4408M: Borislav Petkov <bp@alien8.de>
4411L: linux-edac@vger.kernel.org 4409L: linux-edac@vger.kernel.org
4412S: Maintained 4410S: Maintained
4413F: drivers/edac/amd64_edac* 4411F: drivers/edac/amd64_edac*
4414 4412
4415EDAC-CALXEDA 4413EDAC-CALXEDA
4416M: Doug Thompson <dougthompson@xmission.com>
4417M: Robert Richter <rric@kernel.org> 4414M: Robert Richter <rric@kernel.org>
4418L: linux-edac@vger.kernel.org 4415L: linux-edac@vger.kernel.org
4419S: Maintained 4416S: Maintained
@@ -4429,13 +4426,11 @@ F: drivers/edac/octeon_edac*
4429 4426
4430EDAC-E752X 4427EDAC-E752X
4431M: Mark Gross <mark.gross@intel.com> 4428M: Mark Gross <mark.gross@intel.com>
4432M: Doug Thompson <dougthompson@xmission.com>
4433L: linux-edac@vger.kernel.org 4429L: linux-edac@vger.kernel.org
4434S: Maintained 4430S: Maintained
4435F: drivers/edac/e752x_edac.c 4431F: drivers/edac/e752x_edac.c
4436 4432
4437EDAC-E7XXX 4433EDAC-E7XXX
4438M: Doug Thompson <dougthompson@xmission.com>
4439L: linux-edac@vger.kernel.org 4434L: linux-edac@vger.kernel.org
4440S: Maintained 4435S: Maintained
4441F: drivers/edac/e7xxx_edac.c 4436F: drivers/edac/e7xxx_edac.c
@@ -4459,7 +4454,6 @@ S: Orphan
4459F: drivers/edac/i3000_edac.c 4454F: drivers/edac/i3000_edac.c
4460 4455
4461EDAC-I5000 4456EDAC-I5000
4462M: Doug Thompson <dougthompson@xmission.com>
4463L: linux-edac@vger.kernel.org 4457L: linux-edac@vger.kernel.org
4464S: Maintained 4458S: Maintained
4465F: drivers/edac/i5000_edac.c 4459F: drivers/edac/i5000_edac.c