Merge with /home/wd/git/u-boot/master
authorWolfgang Denk <wd@nyx.(none)>
Tue, 28 Feb 2006 15:39:47 +0000 (16:39 +0100)
committerWolfgang Denk <wd@nyx.(none)>
Tue, 28 Feb 2006 15:39:47 +0000 (16:39 +0100)
1  2 
Makefile

diff --cc Makefile
Simple merge