From: Tom Rini <trini@konsulko.com>
Date: Tue, 18 Apr 2017 14:31:46 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2017.05-rc3~62
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9481f186d0bb06e492f62144cacdb5a8367e3cd2;p=pandora-u-boot.git

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

9481f186d0bb06e492f62144cacdb5a8367e3cd2