Merge with /home/wd/git/u-boot/master
authorWolfgang Denk <wd@pollux.denx.de>
Sat, 13 Aug 2005 16:37:31 +0000 (18:37 +0200)
committerWolfgang Denk <wd@pollux.denx.de>
Sat, 13 Aug 2005 16:37:31 +0000 (18:37 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge