Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@ti.com>
Mon, 14 Jan 2013 22:41:38 +0000 (15:41 -0700)
committerTom Rini <trini@ti.com>
Mon, 14 Jan 2013 22:41:38 +0000 (15:41 -0700)

Trivial merge