Merge branch 'master' of git://git.denx.de/u-boot-at91
authorWolfgang Denk <wd@denx.de>
Sat, 8 Nov 2008 23:09:51 +0000 (00:09 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 8 Nov 2008 23:09:51 +0000 (00:09 +0100)
1  2 
MAINTAINERS
MAKEALL
Makefile

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