Merge with /home/m8/git/u-boot

author Wolfgang Denk <wd@pollux.denx.de>

Sat, 15 Oct 2005 16:23:43 +0000 (18:23 +0200)

committer Wolfgang Denk <wd@pollux.denx.de>

Sat, 15 Oct 2005 16:23:43 +0000 (18:23 +0200)
author Wolfgang Denk <wd@pollux.denx.de>
Sat, 15 Oct 2005 16:23:43 +0000 (18:23 +0200)
committer Wolfgang Denk <wd@pollux.denx.de>
Sat, 15 Oct 2005 16:23:43 +0000 (18:23 +0200)
diff --cc Makefile
Simple merge
diff --cc common/cmd_bootm.c
Simple merge
diff --cc common/flash.c
Simple merge
diff --cc cpu/mpc83xx/i2c.c
Simple merge
diff --cc fs/jffs2/jffs2_1pass.c
Simple merge
diff --cc net/tftp.c
Simple merge
author	Wolfgang Denk <wd@pollux.denx.de>
	Sat, 15 Oct 2005 16:23:43 +0000 (18:23 +0200)
committer	Wolfgang Denk <wd@pollux.denx.de>
	Sat, 15 Oct 2005 16:23:43 +0000 (18:23 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
common/cmd_bootm.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/flash.c	patch \|	diff1 \|	diff2 \|	blob \| history
cpu/mpc83xx/i2c.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/jffs2/jffs2_1pass.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/tftp.c	patch \|	diff1 \|	diff2 \|	blob \| history