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

author Wolfgang Denk <wd@denx.de>

Mon, 11 Oct 2010 08:19:04 +0000 (10:19 +0200)

committer Wolfgang Denk <wd@denx.de>

Mon, 11 Oct 2010 08:19:04 +0000 (10:19 +0200)
author Wolfgang Denk <wd@denx.de>
Mon, 11 Oct 2010 08:19:04 +0000 (10:19 +0200)
committer Wolfgang Denk <wd@denx.de>
Mon, 11 Oct 2010 08:19:04 +0000 (10:19 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Mon, 11 Oct 2010 08:19:04 +0000 (10:19 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Mon, 11 Oct 2010 08:19:04 +0000 (10:19 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history