From: Tom Rini <trini@konsulko.com>
Date: Fri, 13 Apr 2018 13:23:53 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-sh
X-Git-Tag: v2018.05-rc2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93cb6142c1d349492d23bad3951b5a8f59eaafed;p=pandora-u-boot.git

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

93cb6142c1d349492d23bad3951b5a8f59eaafed