Merge with /home/wd/git/u-boot/master
authorWolfgang Denk <wd@pollux.denx.de>
Fri, 12 Aug 2005 21:55:10 +0000 (23:55 +0200)
committerWolfgang Denk <wd@pollux.denx.de>
Fri, 12 Aug 2005 21:55:10 +0000 (23:55 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge