From: Tom Rini <trini@ti.com>
Date: Tue, 25 Sep 2012 23:18:22 +0000 (-0700)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-video
X-Git-Tag: v2012.10-rc2~48
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b3873d3f4c424e6563750bb517fac03c2e833cdc;p=oweals%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-video
---

b3873d3f4c424e6563750bb517fac03c2e833cdc