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

author Wolfgang Denk <wd@denx.de>

Mon, 14 May 2007 22:22:30 +0000 (00:22 +0200)

committer Wolfgang Denk <wd@denx.de>

Mon, 14 May 2007 22:22:30 +0000 (00:22 +0200)
author Wolfgang Denk <wd@denx.de>
Mon, 14 May 2007 22:22:30 +0000 (00:22 +0200)
committer Wolfgang Denk <wd@denx.de>
Mon, 14 May 2007 22:22:30 +0000 (00:22 +0200)
diff --cc board/motionpro/motionpro.c
Simple merge
diff --cc cpu/mpc5xxx/fec.c
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Mon, 14 May 2007 22:22:30 +0000 (00:22 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Mon, 14 May 2007 22:22:30 +0000 (00:22 +0200)
		1	2
board/motionpro/motionpro.c	patch \|	diff1 \|	diff2 \|	blob \| history
cpu/mpc5xxx/fec.c	patch \|	diff1 \|	diff2 \|	blob \| history