Merge with /home/wd/git/u-boot/custodian/u-boot-microblaze
authorWolfgang Denk <wd@denx.de>
Wed, 4 Apr 2007 00:05:48 +0000 (02:05 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 4 Apr 2007 00:05:48 +0000 (02:05 +0200)
1  2 
CREDITS
MAINTAINERS
MAKEALL
Makefile

diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge