Merge branch 'master' of git://git.denx.de/u-boot-mmc

author Tom Rini <trini@konsulko.com>

Fri, 18 Aug 2017 22:24:36 +0000 (18:24 -0400)

committer Tom Rini <trini@konsulko.com>

Fri, 18 Aug 2017 22:24:36 +0000 (18:24 -0400)
author Tom Rini <trini@konsulko.com>
Fri, 18 Aug 2017 22:24:36 +0000 (18:24 -0400)
committer Tom Rini <trini@konsulko.com>
Fri, 18 Aug 2017 22:24:36 +0000 (18:24 -0400)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc board/compulab/cm_fx6/cm_fx6.c
Simple merge
diff --cc common/splash_source.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Fri, 18 Aug 2017 22:24:36 +0000 (18:24 -0400)
committer	Tom Rini <trini@konsulko.com>
	Fri, 18 Aug 2017 22:24:36 +0000 (18:24 -0400)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
board/compulab/cm_fx6/cm_fx6.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/splash_source.c	patch \|	diff1 \|	diff2 \|	blob \| history