From: Tom Rini <trini@konsulko.com>
Date: Mon, 18 Dec 2017 23:39:18 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2018.01-rc2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eeab579aa8d76b96afbd0862029d4452943bafbe;p=oweals%2Fu-boot.git

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

eeab579aa8d76b96afbd0862029d4452943bafbe