Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Sat, 11 Aug 2018 23:48:13 +0000 (19:48 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 11 Aug 2018 23:48:13 +0000 (19:48 -0400)

Trivial merge