Merge branch 'master' of /home/stefan/git/u-boot/u-boot
authorStefan Roese <sr@denx.de>
Wed, 13 Aug 2008 04:47:12 +0000 (06:47 +0200)
committerStefan Roese <sr@denx.de>
Wed, 13 Aug 2008 04:47:12 +0000 (06:47 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge