Merge branch 'master' of git://www.denx.de/git/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Wed, 9 Jan 2008 10:30:15 +0000 (11:30 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Jan 2008 10:30:15 +0000 (11:30 +0100)
1  2 
MAKEALL
Makefile

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