From: Tom Rini <trini@ti.com>
Date: Fri, 14 Nov 2014 20:05:53 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-video
X-Git-Tag: v2015.01-rc2~78
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6393c43c18a1aadcdcdd8551826eef15f50353d5;p=oweals%2Fu-boot.git

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

6393c43c18a1aadcdcdd8551826eef15f50353d5