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

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

Mon, 30 Jun 2014 21:00:34 +0000 (23:00 +0200)

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

Mon, 30 Jun 2014 21:00:34 +0000 (23:00 +0200)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 30 Jun 2014 21:00:34 +0000 (23:00 +0200)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 30 Jun 2014 21:00:34 +0000 (23:00 +0200)
diff --cc arch/arm/imx-common/Makefile
Simple merge
diff --cc arch/arm/include/asm/imx-common/iomux-v3.h
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc include/configs/gw_ventana.h
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Mon, 30 Jun 2014 21:00:34 +0000 (23:00 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Mon, 30 Jun 2014 21:00:34 +0000 (23:00 +0200)
		1	2
arch/arm/imx-common/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/imx-common/iomux-v3.h	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/gw_ventana.h	patch \|	diff1 \|	diff2 \|	blob \| history