Merge with /home/wd/git/u-boot/work
authorWolfgang Denk <wd@denx.de>
Thu, 9 Aug 2007 21:47:43 +0000 (23:47 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 9 Aug 2007 21:47:43 +0000 (23:47 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge