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)
commit4bfa18fb99e4ffa9451d9ec95375a5e970847bf8
treef282cf36e32c60c4fce716c1e7ce236f7d19f5ae
parent42d44f631c4e8e5359775bdc098f2fffde4e5c05
parente72f46787f44c1104a8df18511ab230b6072a1f0
Merge branch 'master' of git://git.denx.de/u-boot-sh
MAINTAINERS
boards.cfg
include/configs/shmin.h