Merge git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Tue, 27 Jun 2017 13:32:37 +0000 (09:32 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 27 Jun 2017 13:32:37 +0000 (09:32 -0400)
commit821560fd8e43eecc208c1c52ad24faadb6b52703
treeefb56bc170674d3a6680ca4d343888e9e84403c7
parentb8a238f1376f16c387765107b9d7f62e4358dd48
parent65496a34835cb4c9547bd02dd15b018c333add9d
Merge git://www.denx.de/git/u-boot-imx

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/imx6qdl_icore_rqs.h
include/configs/imx6ul_geam.h
include/configs/imx6ul_isiot.h
configs/imx6qdl_icore_mmc_defconfig
configs/imx6qdl_icore_rqs_mmc_defconfig
configs/imx6ul_geam_mmc_defconfig
configs/imx6ul_geam_nand_defconfig
configs/imx6ul_isiot_emmc_defconfig
configs/imx6ul_isiot_mmc_defconfig
configs/imx6ul_isiot_nand_defconfig
drivers/mmc/fsl_esdhc.c
drivers/net/phy/Kconfig
include/configs/imx6-engicam.h
scripts/config_whitelist.txt