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

author Wolfgang Denk <wd@denx.de>

Wed, 4 Apr 2007 00:05:48 +0000 (02:05 +0200)

committer Wolfgang Denk <wd@denx.de>

Wed, 4 Apr 2007 00:05:48 +0000 (02:05 +0200)
author Wolfgang Denk <wd@denx.de>
Wed, 4 Apr 2007 00:05:48 +0000 (02:05 +0200)
committer Wolfgang Denk <wd@denx.de>
Wed, 4 Apr 2007 00:05:48 +0000 (02:05 +0200)
diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Wed, 4 Apr 2007 00:05:48 +0000 (02:05 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 4 Apr 2007 00:05:48 +0000 (02:05 +0200)
		1	2
CREDITS	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history