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)
commit981481958f98f17089bd3d776f71599756d9b9bd
tree2b6e34258221bb953f9c45c1f1acf4de7129b2d3
parentf1972e32559e34290f13654859264da331795ea5
parent44a53b57439dc1f117135b4f8c22d25915096164
Merge branch 'master' of git://git.denx.de/u-boot-video