Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Tue, 19 Jan 2016 13:32:38 +0000 (08:32 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 19 Jan 2016 13:32:38 +0000 (08:32 -0500)

Trivial merge