From: Tom Rini <trini@konsulko.com>
Date: Tue, 9 Jan 2018 18:28:51 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2018.03-rc1~239
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=98691a60abffb44303d7dae6e9e699d0daded930;p=oweals%2Fu-boot.git

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

98691a60abffb44303d7dae6e9e699d0daded930