Merge with /home/sr/git/u-boot/denx-merge-sr
authorWolfgang Denk <wd@pollux.denx.de>
Tue, 30 Jan 2007 16:32:15 +0000 (17:32 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 30 Jan 2007 16:32:15 +0000 (17:32 +0100)
1  2 
Makefile

diff --cc Makefile
Simple merge