Merge branch 'master' of git://git.denx.de/u-boot-sh into next
authorWolfgang Denk <wd@denx.de>
Tue, 29 Jun 2010 19:37:44 +0000 (21:37 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 29 Jun 2010 19:37:44 +0000 (21:37 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge