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)
commitc1a6e9fe82b46159af8cc4cf34fb51ee47862f05
tree9ef7fc8fa3483dc7dc92034162118526a5d4377a
parentb06c47a13c52cec01902d0094fdd7f78f4d54152
parentd6ca8ca7ec555bdd3372687d0d775c837a09ff6e
Merge branch 'topic/ipu-destaging' of git://git.pengutronix.de/git/pza/linux into drm-next

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
drivers/staging/imx-drm/imx-hdmi.c
drivers/staging/imx-drm/imx-tve.c