Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Sun, 24 Jun 2018 01:47:39 +0000 (21:47 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 24 Jun 2018 01:47:39 +0000 (21:47 -0400)

Trivial merge