Merge branch 'master' of git://git.denx.de/u-boot-sh

author Wolfgang Denk <wd@denx.de>

Fri, 4 Feb 2011 19:38:27 +0000 (20:38 +0100)

committer Wolfgang Denk <wd@denx.de>

Fri, 4 Feb 2011 19:38:27 +0000 (20:38 +0100)
author Wolfgang Denk <wd@denx.de>
Fri, 4 Feb 2011 19:38:27 +0000 (20:38 +0100)
committer Wolfgang Denk <wd@denx.de>
Fri, 4 Feb 2011 19:38:27 +0000 (20:38 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc include/configs/shmin.h
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Fri, 4 Feb 2011 19:38:27 +0000 (20:38 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Fri, 4 Feb 2011 19:38:27 +0000 (20:38 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/shmin.h	patch \|	diff1 \|	diff2 \|	blob \| history