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

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

Thu, 4 Apr 2013 09:49:32 +0000 (11:49 +0200)

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

Thu, 4 Apr 2013 09:49:32 +0000 (11:49 +0200)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 4 Apr 2013 09:49:32 +0000 (11:49 +0200)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 4 Apr 2013 09:49:32 +0000 (11:49 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc drivers/spi/mxc_spi.c
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Thu, 4 Apr 2013 09:49:32 +0000 (11:49 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Thu, 4 Apr 2013 09:49:32 +0000 (11:49 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/mxc_spi.c	patch \|	diff1 \|	diff2 \|	blob \| history