From: Tom Rini <trini@ti.com>
Date: Mon, 19 Nov 2012 16:28:04 +0000 (-0700)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-video
X-Git-Tag: v2013.01-rc2~139
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=178d0cc1a4c73c3341afbeb2a93b172de8c96bd1;p=oweals%2Fu-boot.git

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

178d0cc1a4c73c3341afbeb2a93b172de8c96bd1