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

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