Merge git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Wed, 13 Jun 2018 15:43:59 +0000 (11:43 -0400)
committerTom Rini <[email protected]>
Wed, 13 Jun 2018 15:43:59 +0000 (11:43 -0400)

Trivial merge