Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@ti.com>
Fri, 14 Nov 2014 20:05:53 +0000 (15:05 -0500)
committerTom Rini <trini@ti.com>
Fri, 14 Nov 2014 20:05:53 +0000 (15:05 -0500)

Trivial merge