Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Wed, 8 Mar 2017 12:14:21 +0000 (07:14 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 8 Mar 2017 12:14:21 +0000 (07:14 -0500)

Trivial merge