Merge git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Wed, 25 Apr 2018 00:27:43 +0000 (20:27 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 25 Apr 2018 00:27:43 +0000 (20:27 -0400)

Trivial merge