Merge branch 'master' of git://git.denx.de/u-boot-microblaze
authorWolfgang Denk <wd@denx.de>
Tue, 15 Sep 2009 19:45:50 +0000 (21:45 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 15 Sep 2009 19:45:50 +0000 (21:45 +0200)
1  2 
MAINTAINERS
MAKEALL
Makefile

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