Merge remote-tracking branch 'edac-amd/for-next'

[deliverable/linux.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index 2cb28a39851d78112986ade00e815ebc86dd3b71..1b48cd74bf5d97d7260e17bd174d8f56940a3347 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -3522,6 +3522,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
@@ -3658,6 +3662,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