Merge branch 'master' of git://git.denx.de/u-boot-marvell
authorWolfgang Denk <wd@denx.de>
Thu, 17 Jun 2010 20:22:06 +0000 (22:22 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 17 Jun 2010 20:22:06 +0000 (22:22 +0200)
1  2 
MAINTAINERS
MAKEALL
Makefile

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