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)
commitb3873d3f4c424e6563750bb517fac03c2e833cdc
tree3ddcf37e04ca77cfaa6ad5b7b14bf233c841e0fd
parent5cf41dccff9d1e8c297de6eae8422d3e322eebbc
parentd23019f3d65c2746d8aecf5ab2c93591f00cb965
Merge branch 'master' of git://git.denx.de/u-boot-video