From: Tom Rini <trini@konsulko.com>
Date: Mon, 16 Apr 2018 17:24:20 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2018.05-rc2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d24b01ce0e938b49270386467e3edd4476e9108;p=pandora-u-boot.git

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

9d24b01ce0e938b49270386467e3edd4476e9108