From: Tom Rini <trini@konsulko.com>
Date: Tue, 30 Jan 2018 15:09:01 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2018.03-rc2~64
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f1554b28d31250df5418254e79e0bf75ff3b2e54;p=oweals%2Fu-boot.git

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

f1554b28d31250df5418254e79e0bf75ff3b2e54