From: Wolfgang Denk <wd@denx.de>
Date: Mon, 28 Nov 2011 18:53:31 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-video
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5251742a7b2465c8de2841bc7db5a1e059c13a3;p=people%2Fms%2Fu-boot.git

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

* 'master' of git://git.denx.de/u-boot-video:
  DIU: 1080P and 720P support
  CFB: Fix font rendering on mx5 framebuffer
---

d5251742a7b2465c8de2841bc7db5a1e059c13a3