From: Tom Rini <trini@konsulko.com>
Date: Sun, 28 Jan 2018 18:56:19 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2018.03-rc1~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2ee91501892d3280a4c58093ad3a18dccd0b562;p=pandora-u-boot.git

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

f2ee91501892d3280a4c58093ad3a18dccd0b562