From: Wolfgang Denk <wd@denx.de>
Date: Wed, 16 Nov 2011 19:44:03 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-video
X-Git-Tag: v2011.12-rc1~219^2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=9dfa8da709a1589d177d99c597d9b18d8c9a145d

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

* 'master' of git://git.denx.de/u-boot-video:
  api: export LCD device to external apps
  font: split font data from video_font.h
  tools: logo: split bmp arrays from bmp_logo.h
  lcd: add clear and draw bitmap declaration
  VIDEO: mx3fb: GCC4.6 fix build warnings
  Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bug
---

9dfa8da709a1589d177d99c597d9b18d8c9a145d