Merge with /home/tur/git/u-boot#cm1_qp1
authorWolfgang Denk <wd@denx.de>
Wed, 11 Jul 2007 23:42:41 +0000 (01:42 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 11 Jul 2007 23:42:41 +0000 (01:42 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge