Merge branch 'master' of /home/stefan/git/u-boot/u-boot
authorStefan Roese <sr@denx.de>
Tue, 3 Jun 2008 18:19:08 +0000 (20:19 +0200)
committerStefan Roese <sr@denx.de>
Tue, 3 Jun 2008 18:19:08 +0000 (20:19 +0200)
1  2 
MAKEALL
Makefile

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