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

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

Sat, 2 Feb 2013 18:29:59 +0000 (19:29 +0100)

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

Sat, 2 Feb 2013 18:29:59 +0000 (19:29 +0100)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 2 Feb 2013 18:29:59 +0000 (19:29 +0100)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 2 Feb 2013 18:29:59 +0000 (19:29 +0100)
diff --cc Makefile
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc spl/Makefile
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Sat, 2 Feb 2013 18:29:59 +0000 (19:29 +0100)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Sat, 2 Feb 2013 18:29:59 +0000 (19:29 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
spl/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history