Merge with /home/git/u-boot
authorWolfgang Denk <wd@denx.de>
Sat, 5 May 2007 19:44:47 +0000 (21:44 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 5 May 2007 19:44:47 +0000 (21:44 +0200)
1  2 
common/main.c

diff --cc common/main.c
Simple merge