From: Tom Rini <trini@konsulko.com>
Date: Tue, 8 May 2018 17:47:26 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-uniphier
X-Git-Tag: v2018.07-rc1~193
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1ccd3f14ca0a481ce173cd0ce4fd1a66d50a4985;p=oweals%2Fu-boot.git

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

1ccd3f14ca0a481ce173cd0ce4fd1a66d50a4985