Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Mon, 10 Apr 2017 12:07:29 +0000 (08:07 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 10 Apr 2017 12:07:29 +0000 (08:07 -0400)

Trivial merge