Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Tue, 27 Jan 2009 19:55:57 +0000 (20:55 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 27 Jan 2009 19:55:57 +0000 (20:55 +0100)
1  2 
MAINTAINERS
MAKEALL
Makefile

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