]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Fri, 16 Jul 2010 21:15:01 +0000 (23:15 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 16 Jul 2010 21:15:01 +0000 (23:15 +0200)
1  2 
MAINTAINERS
MAKEALL
Makefile
boards.cfg

diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc boards.cfg
Simple merge