From: Tom Rini <trini@konsulko.com>
Date: Tue, 13 Mar 2018 23:00:29 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2018.05-rc1~136
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cc66dcdd16a88a56791d1951bca54b3048e3f96c;p=oweals%2Fu-boot.git

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

cc66dcdd16a88a56791d1951bca54b3048e3f96c