From: Tom Rini <trini@konsulko.com>
Date: Mon, 10 Apr 2017 12:07:29 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2017.05-rc2~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=01cce5fdd098add2b8aa570468cb35fca5d778fe;p=oweals%2Fu-boot.git

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

01cce5fdd098add2b8aa570468cb35fca5d778fe