Merge with /home/m8/git/u-boot
authorWolfgang Denk <wd@pollux.denx.de>
Sat, 15 Oct 2005 16:23:43 +0000 (18:23 +0200)
committerWolfgang Denk <wd@pollux.denx.de>
Sat, 15 Oct 2005 16:23:43 +0000 (18:23 +0200)
1  2 
Makefile
common/cmd_bootm.c
common/flash.c
cpu/mpc83xx/i2c.c
fs/jffs2/jffs2_1pass.c
net/tftp.c

diff --cc Makefile
Simple merge
Simple merge
diff --cc common/flash.c
Simple merge
Simple merge
Simple merge
diff --cc net/tftp.c
Simple merge