Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Fri, 12 Dec 2008 23:26:19 +0000 (00:26 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 12 Dec 2008 23:26:19 +0000 (00:26 +0100)
1  2 
Makefile

diff --cc Makefile
Simple merge