From: Tom Rini <trini@konsulko.com>
Date: Mon, 30 Apr 2018 11:14:05 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-imx
X-Git-Tag: v2018.05-rc3~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b25f8e2112b1582ce6386e846800a31bab688e50;p=oweals%2Fu-boot.git

Merge git://git.denx.de/u-boot-imx
---

b25f8e2112b1582ce6386e846800a31bab688e50