Merge git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Mon, 19 Mar 2018 13:56:34 +0000 (09:56 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 19 Mar 2018 13:56:34 +0000 (09:56 -0400)

Trivial merge