Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Mon, 22 Oct 2018 17:56:10 +0000 (13:56 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 22 Oct 2018 17:56:10 +0000 (13:56 -0400)

Trivial merge