From: Tom Rini <trini@konsulko.com>
Date: Thu, 21 Dec 2017 14:54:10 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2018.01-rc3~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48a346061d1f0a7eff566f6a7cc7eeeba7efb1e2;p=pandora-u-boot.git

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

48a346061d1f0a7eff566f6a7cc7eeeba7efb1e2