]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master-sync' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Sat, 24 Oct 2009 20:26:09 +0000 (22:26 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 24 Oct 2009 20:26:09 +0000 (22:26 +0200)
1  2 
MAKEALL
Makefile

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