From: Tom Rini <trini@konsulko.com>
Date: Thu, 29 Mar 2018 12:25:56 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2018.05-rc1~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2476d26fd307edc84e8257dc1bccefb65547f88a;p=pandora-u-boot.git

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

2476d26fd307edc84e8257dc1bccefb65547f88a