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

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

Fri, 15 Mar 2013 14:18:31 +0000 (15:18 +0100)

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

Fri, 15 Mar 2013 14:18:31 +0000 (15:18 +0100)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 15 Mar 2013 14:18:31 +0000 (15:18 +0100)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 15 Mar 2013 14:18:31 +0000 (15:18 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc drivers/mmc/mxsmmc.c
Simple merge
diff --cc include/configs/apx4devkit.h
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Fri, 15 Mar 2013 14:18:31 +0000 (15:18 +0100)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Fri, 15 Mar 2013 14:18:31 +0000 (15:18 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/mxsmmc.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/apx4devkit.h	patch \|	diff1 \|	diff2 \|	blob \| history