From: Wolfgang Denk <wd@denx.de>
Date: Wed, 18 Jul 2012 08:47:03 +0000 (+0200)
Subject: Merge branch 'next' of git://git.denx.de/u-boot-video
X-Git-Tag: v2025.01-rc5-pxa1908~17673^2~52^2~2
X-Git-Url: http://git.dujemihanovic.xyz/html/%7B%7B%20.Permalink%20%7D%7D?a=commitdiff_plain;h=66714b1a6df0a5a9f1656a6d4e6eea3c7ecdf7ae;p=u-boot.git

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

* 'next' of git://git.denx.de/u-boot-video:
  ipu_common: Add ldb_clk for use in parenting the pixel clock
  ipu_common: Do not hardcode the ipu_clk frequency
  ipu_common: Rename MXC_CCM_BASE
  ipu_common: Let clk_ipu_enable/disable only run on MX51 and MX53
  ipu_common: Only apply the erratum to MX51
  video: Rename CONFIG_VIDEO_MX5
  mx6: Allow mx6 to access the IPUv3 registers
  common lcd: minor coding style changes

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

66714b1a6df0a5a9f1656a6d4e6eea3c7ecdf7ae