Merge with pollux.denx.org:/home/git/u-boot/.git
author <m8@hekate.semihalf.com> <>
Tue, 16 Aug 2005 15:34:22 +0000 (17:34 +0200)
committer <m8@hekate.semihalf.com> <>
Tue, 16 Aug 2005 15:34:22 +0000 (17:34 +0200)
1  2 
MAKEALL
Makefile

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