Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Fri, 4 Feb 2011 19:38:27 +0000 (20:38 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 4 Feb 2011 19:38:27 +0000 (20:38 +0100)
1  2 
MAINTAINERS
boards.cfg
include/configs/shmin.h

diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
Simple merge