Merge with /home/wd/git/u-boot/custodian/u-boot-blackfin

author Wolfgang Denk <wd@denx.de>

Wed, 21 Mar 2007 23:00:03 +0000 (00:00 +0100)

committer Wolfgang Denk <wd@denx.de>

Wed, 21 Mar 2007 23:00:03 +0000 (00:00 +0100)
author Wolfgang Denk <wd@denx.de>
Wed, 21 Mar 2007 23:00:03 +0000 (00:00 +0100)
committer Wolfgang Denk <wd@denx.de>
Wed, 21 Mar 2007 23:00:03 +0000 (00:00 +0100)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Wed, 21 Mar 2007 23:00:03 +0000 (00:00 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 21 Mar 2007 23:00:03 +0000 (00:00 +0100)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history