From: Tom Rini <trini@konsulko.com>
Date: Mon, 30 Apr 2018 10:52:32 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-sunxi
X-Git-Tag: v2018.05-rc3~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abeb9d7897510533ce3a0a9515cac16db5bed834;p=pandora-u-boot.git

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

abeb9d7897510533ce3a0a9515cac16db5bed834