Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Sun, 28 Oct 2018 13:28:26 +0000 (09:28 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 28 Oct 2018 13:28:26 +0000 (09:28 -0400)

Trivial merge