Merge with git://www.denx.de/git/u-boot.git
authorMarkus Klotzbuecher <mk@denx.de>
Wed, 6 Jun 2007 10:36:32 +0000 (12:36 +0200)
committerMarkus Klotzbuecher <mk@pollux.denx.de>
Wed, 6 Jun 2007 10:36:32 +0000 (12:36 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge