Merge git://git.denx.de/u-boot-video
authorTom Rini <[email protected]>
Sat, 24 Feb 2018 13:02:17 +0000 (08:02 -0500)
committerTom Rini <[email protected]>
Sat, 24 Feb 2018 13:02:17 +0000 (08:02 -0500)

Trivial merge