Merge with /home/tur/git/u-boot#motionpro

author Wolfgang Denk <wd@denx.de>

Sun, 27 May 2007 23:11:11 +0000 (01:11 +0200)

committer Wolfgang Denk <wd@denx.de>

Sun, 27 May 2007 23:11:11 +0000 (01:11 +0200)
author Wolfgang Denk <wd@denx.de>
Sun, 27 May 2007 23:11:11 +0000 (01:11 +0200)
committer Wolfgang Denk <wd@denx.de>
Sun, 27 May 2007 23:11:11 +0000 (01:11 +0200)
diff --cc board/motionpro/motionpro.c
Simple merge
diff --cc common/main.c
Simple merge
diff --cc cpu/mpc5xxx/fec.c
Simple merge
diff --cc include/configs/IceCube.h
Simple merge
diff --cc include/configs/hmi1001.h
Simple merge
diff --cc include/configs/mcc200.h
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Sun, 27 May 2007 23:11:11 +0000 (01:11 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Sun, 27 May 2007 23:11:11 +0000 (01:11 +0200)
		1	2
board/motionpro/motionpro.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
cpu/mpc5xxx/fec.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/IceCube.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/hmi1001.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/mcc200.h	patch \|	diff1 \|	diff2 \|	blob \| history