Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Mon, 28 Nov 2011 18:53:31 +0000 (19:53 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 28 Nov 2011 18:53:31 +0000 (19:53 +0100)
commitd5251742a7b2465c8de2841bc7db5a1e059c13a3
treece9fbf7053897a972481e00f835685d8368d3553
parent99258c34103efad3395c679256a221731d010c4b
parentd8bf22bb0ee95ac5fd74a3b357a47bc94283336d
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