Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Sat, 7 Oct 2017 13:12:04 +0000 (09:12 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 7 Oct 2017 13:12:04 +0000 (09:12 -0400)

Trivial merge