Merge git://git.denx.de/u-boot-fsl-qoriq

author Tom Rini <trini@konsulko.com>

Tue, 18 Apr 2017 15:36:06 +0000 (11:36 -0400)

committer Tom Rini <trini@konsulko.com>

Tue, 18 Apr 2017 15:36:06 +0000 (11:36 -0400)
author Tom Rini <trini@konsulko.com>
Tue, 18 Apr 2017 15:36:06 +0000 (11:36 -0400)
committer Tom Rini <trini@konsulko.com>
Tue, 18 Apr 2017 15:36:06 +0000 (11:36 -0400)
diff --cc arch/arm/cpu/armv7/Makefile
Simple merge
diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc drivers/crypto/fsl/jr.c
Simple merge
diff --cc drivers/ddr/fsl/options.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Tue, 18 Apr 2017 15:36:06 +0000 (11:36 -0400)
committer	Tom Rini <trini@konsulko.com>
	Tue, 18 Apr 2017 15:36:06 +0000 (11:36 -0400)
		1	2
arch/arm/cpu/armv7/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/crypto/fsl/jr.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ddr/fsl/options.c	patch \|	diff1 \|	diff2 \|	blob \| history