Merge git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Mon, 2 Jul 2018 02:13:34 +0000 (22:13 -0400)
committerTom Rini <[email protected]>
Mon, 2 Jul 2018 02:13:34 +0000 (22:13 -0400)

Trivial merge