Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Tue, 7 Aug 2018 11:15:20 +0000 (07:15 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 7 Aug 2018 11:15:20 +0000 (07:15 -0400)

Trivial merge