Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Tue, 18 Apr 2017 15:36:06 +0000 (11:36 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 18 Apr 2017 15:36:06 +0000 (11:36 -0400)
commit3c476d841daa491f87c8f07851038afbdf4d90a8
tree131891877d7b9b112ebc8c05ab88d53b9b18b702
parent9481f186d0bb06e492f62144cacdb5a8367e3cd2
parente0dfec863e2ca5088dd797a5b6853d4c0df9002c
Merge git://git.denx.de/u-boot-fsl-qoriq
arch/arm/cpu/armv7/Makefile
arch/arm/dts/Makefile
drivers/crypto/fsl/jr.c
drivers/ddr/fsl/options.c