From: Tom Rini <trini@konsulko.com>
Date: Wed, 3 Jan 2018 17:27:12 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2018.01~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca833ca9579b29c5667ea2fa7a9d3f89f1599a94;p=oweals%2Fu-boot.git

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

ca833ca9579b29c5667ea2fa7a9d3f89f1599a94