Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Mon, 11 Sep 2017 19:54:39 +0000 (15:54 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 11 Sep 2017 19:54:39 +0000 (15:54 -0400)

Trivial merge