Merge branch 'topic/ipu-destaging' of git://git.pengutronix.de/git/pza/linux into...
authorDave Airlie <airlied@redhat.com>
Wed, 11 Jun 2014 00:13:58 +0000 (10:13 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 11 Jun 2014 00:13:58 +0000 (10:13 +1000)
Destage IPUv3

* 'topic/ipu-destaging' of git://git.pengutronix.de/git/pza/linux:
  gpu: ipu-v3: Register the CSI modules
  gpu: ipu-v3: Add CSI and SMFC module enable wrappers
  gpu: ipu-v3: Add ipu_idmac_get_current_buffer function
  gpu: ipu-v3: Add SMFC code
  gpu: ipu-v3: Move i.MX IPUv3 core driver out of staging

1  2 
drivers/staging/imx-drm/imx-hdmi.c
drivers/staging/imx-drm/imx-tve.c

Simple merge
Simple merge