From: Tom Rini <trini@konsulko.com>
Date: Fri, 1 Sep 2017 14:40:59 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-imx
X-Git-Tag: v2017.09-rc4~39
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6aee2ab68c362ace5a59f89a63abed82e0bf19e5;p=oweals%2Fu-boot.git

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
---

6aee2ab68c362ace5a59f89a63abed82e0bf19e5