Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Tue, 8 Aug 2017 21:06:19 +0000 (17:06 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 8 Aug 2017 21:06:19 +0000 (17:06 -0400)

Trivial merge