Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Sun, 8 Jul 2018 22:56:07 +0000 (18:56 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 8 Jul 2018 22:56:07 +0000 (18:56 -0400)

Trivial merge