Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@ti.com>
Tue, 25 Sep 2012 23:18:22 +0000 (16:18 -0700)
committerTom Rini <trini@ti.com>
Tue, 25 Sep 2012 23:18:22 +0000 (16:18 -0700)

Trivial merge