From: Wolfgang Denk <wd@denx.de>
Date: Mon, 17 Oct 2011 19:48:20 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-video
X-Git-Tag: v2011.12-rc1~514
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=10d1a160f5e28b05f891c050ca2f23855b226f5f;p=oweals%2Fu-boot.git

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

* 'master' of git://git.denx.de/u-boot-video:
  video: Moving mx3fb.c to CONFIG_VIDEO
  mx31: make HSP clock for mx3fb driver available
  MX5: Make IPU display output and pixel format configurable
  VIDEO: MX5: export pix format
  VIDEO: MX5: Switch MX5 to CONFIG_VIDEO
  video: update the Freescale DIU driver to use linux/fb.h
---

10d1a160f5e28b05f891c050ca2f23855b226f5f