From: Tom Rini <trini@ti.com>
Date: Wed, 10 Jul 2013 12:42:25 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-video
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f4998ab4429af4b805f8566268c3b761aa4babd;p=people%2Fms%2Fu-boot.git

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

2f4998ab4429af4b805f8566268c3b761aa4babd