Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Tue, 18 Oct 2016 14:20:26 +0000 (10:20 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 18 Oct 2016 14:20:26 +0000 (10:20 -0400)

Trivial merge