Merge with /home/tur/git/u-boot#cm5200-si

author Wolfgang Denk <wd@denx.de>

Tue, 7 Aug 2007 15:04:30 +0000 (17:04 +0200)

committer Wolfgang Denk <wd@denx.de>

Tue, 7 Aug 2007 15:04:30 +0000 (17:04 +0200)
author Wolfgang Denk <wd@denx.de>
Tue, 7 Aug 2007 15:04:30 +0000 (17:04 +0200)
committer Wolfgang Denk <wd@denx.de>
Tue, 7 Aug 2007 15:04:30 +0000 (17:04 +0200)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc cpu/mpc5xxx/fec.c
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Tue, 7 Aug 2007 15:04:30 +0000 (17:04 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Tue, 7 Aug 2007 15:04:30 +0000 (17:04 +0200)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
cpu/mpc5xxx/fec.c	patch \|	diff1 \|	diff2 \|	blob \| history