From: Tom Rini <trini@konsulko.com>
Date: Thu, 26 Apr 2018 11:21:41 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2018.05-rc3~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2a1f120cf638fd8a149bc8a46aec961c2fb9406;p=pandora-u-boot.git

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

d2a1f120cf638fd8a149bc8a46aec961c2fb9406