Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire
authorWolfgang Denk <wd@denx.de>
Fri, 22 Feb 2008 11:56:11 +0000 (12:56 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 22 Feb 2008 11:56:11 +0000 (12:56 +0100)
1  2 
Makefile

diff --cc Makefile
Simple merge