Merge branch 'master' of /home/wd/git/u-boot/master

[karo-tx-uboot.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index 9ddf0d28ac777964c4f811e59f1c48657f81ccd9..4f3cdbb231749652eb82c84f5bef2d460180deea 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -222,7 +222,7 @@ E: mpfj@mimc.co.uk
 D: Port to MIMC200 board
 
 N: Gary Jennejohn
-E: garyj@jennejohn.org, gj@denx.de
+E: garyj@jennejohn.org
 D: Support for Samsung ARM920T S3C2400X, ARM920T "TRAB"
 W: www.denx.de
 
@@ -437,7 +437,7 @@ D: FADS823 configuration, MPC823 video support, I2C, wireless keyboard, lots mor
 
 N: Andre Schwarz
 E: andre.schwarz@matrix-vision.de
-D: Support for Matrix Vision boards (MVBLM7/MVBC_P)
+D: Support for Matrix Vision boards (MVBLM7/MVBC_P/MVSMR)
 
 N: Robert Schwebel
 E: r.schwebel@pengutronix.de
@@ -511,6 +511,11 @@ N: Martin Winistoerfer
 E: martinwinistoerfer@gmx.ch
 D: Port to MPC555/556 microcontrollers and support for cmi board
 
+N: David Wu
+E: support@arcturusnetworks.com
+D: Mercury Security EP2500
+W: http://www.arcturusnetworks.com
+
 N: Ming-Len Wu
 E: minglen_wu@techware.com.tw
 D: Motorola MX1ADS board support