Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Mon, 16 Apr 2018 17:24:20 +0000 (13:24 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 16 Apr 2018 17:24:20 +0000 (13:24 -0400)

Trivial merge