Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@ti.com>
Mon, 13 Jan 2014 13:41:04 +0000 (08:41 -0500)
committerTom Rini <trini@ti.com>
Mon, 13 Jan 2014 13:41:04 +0000 (08:41 -0500)

Trivial merge