Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Tue, 27 Jun 2017 13:33:10 +0000 (09:33 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 27 Jun 2017 13:33:10 +0000 (09:33 -0400)

Trivial merge