Merge with /home/wd/git/u-boot/custodian/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Wed, 6 Jun 2007 14:18:01 +0000 (16:18 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 6 Jun 2007 14:18:01 +0000 (16:18 +0200)
1  2 
MAKEALL
Makefile

diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge