Merge with /home/wd/git/u-boot/stx-gp3ssa
authorWolfgang Denk <wd@denx.de>
Thu, 31 May 2007 15:21:22 +0000 (17:21 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 31 May 2007 15:21:22 +0000 (17:21 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge