Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Tue, 18 Apr 2017 14:31:46 +0000 (10:31 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 18 Apr 2017 14:31:46 +0000 (10:31 -0400)

Trivial merge