Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

author Albert ARIBAUD <albert.u.boot@aribaud.net>

Fri, 28 Jun 2013 15:51:13 +0000 (17:51 +0200)

committer Albert ARIBAUD <albert.u.boot@aribaud.net>

Fri, 28 Jun 2013 15:51:13 +0000 (17:51 +0200)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 28 Jun 2013 15:51:13 +0000 (17:51 +0200)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 28 Jun 2013 15:51:13 +0000 (17:51 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Fri, 28 Jun 2013 15:51:13 +0000 (17:51 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Fri, 28 Jun 2013 15:51:13 +0000 (17:51 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history