summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-11-28 18:57:38 (GMT)
committerWolfgang Denk <wd@denx.de>2011-11-28 18:57:38 (GMT)
commit68435fa1519cb92493fd59e05bc9dbe7f2205feb (patch)
treec9f8c096f08608c1307e8ea59f061b265c6ebb66 /CREDITS
parentd5251742a7b2465c8de2841bc7db5a1e059c13a3 (diff)
parent623e03256e222b42fb86fd81fafe508e3cb569a4 (diff)
downloadu-boot-fsl-qoriq-68435fa1519cb92493fd59e05bc9dbe7f2205feb.tar.xz
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging: MAKEALL: drop obsolete mx31pdk_nand target dataflash: fix parameters order in write_dataflash() hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board arm: a320evb: define mach-type in board config file OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that. Fix Stelian's email address
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS2
1 files changed, 1 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index e8e923a..dead57d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -376,7 +376,7 @@ D: Support for the Wind River sbc405, sbc8240 board
W: http://www.windriver.com
N: Stelian Pop
-E: stelian.pop@leadtechdesign.com
+E: stelian@popies.net
D: Atmel AT91CAP9ADK support
N: Ricardo Ribalda Delgado