Merge branch 'master' of /home/stefan/git/u-boot/u-boot
authorStefan Roese <sr@denx.de>
Thu, 17 Jan 2008 15:04:12 +0000 (16:04 +0100)
committerStefan Roese <sr@denx.de>
Thu, 17 Jan 2008 15:04:12 +0000 (16:04 +0100)
1  2 
MAINTAINERS
MAKEALL
Makefile

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