Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Tue, 15 May 2018 12:29:24 +0000 (08:29 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 15 May 2018 12:29:24 +0000 (08:29 -0400)

Trivial merge