Merge tag 'locks-v4.9-1' of git://git.samba.org/jlayton/linux

[linux.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index 0367a4b71ceadc49bb7897194f8c6fe89c681b90..936f05a7500c9f6be06844b8f8c0e5dce098f901 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -3523,6 +3523,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
@@ -3659,6 +3663,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