Merge git://git.denx.de/u-boot-imx
authorTom Rini <trini@konsulko.com>
Fri, 1 Sep 2017 14:40:59 +0000 (10:40 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 1 Sep 2017 14:40:59 +0000 (10:40 -0400)
commit6aee2ab68c362ace5a59f89a63abed82e0bf19e5
tree0b76045a178e9c0ed61e141bd8dfb3e34e4e86a9
parent4109d702934c361b2ae2a5ad34f4dfee708cc214
parent63af4b0ad0666e0797306593813b6272e1995bde
Merge git://git.denx.de/u-boot-imx

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/imx6qdl_icore_mmc_defconfig
configs/imx6qdl_icore_rqs_defconfig
configs/apalis_imx6_defconfig
configs/colibri_imx6_defconfig
configs/imx6qdl_icore_mmc_defconfig