From: Tom Rini <trini@konsulko.com>
Date: Sun, 25 Feb 2018 20:39:10 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2018.03-rc4~27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=85447f785ce8c0ab8e40850dc457a1fc833d224f;p=oweals%2Fu-boot.git

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

85447f785ce8c0ab8e40850dc457a1fc833d224f