From: Tom Rini <trini@konsulko.com>
Date: Wed, 17 May 2017 18:13:16 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2017.07-rc1~254
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae1b939930b0fffc062bb99196ec22e19afcc7e8;p=pandora-u-boot.git

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

ae1b939930b0fffc062bb99196ec22e19afcc7e8