From: Dave Airlie <airlied@redhat.com>
Date: Wed, 11 Jun 2014 00:13:58 +0000 (+1000)
Subject: Merge branch 'topic/ipu-destaging' of git://git.pengutronix.de/git/pza/linux into... 
X-Git-Tag: firefly_0821_release~176^2~3773^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c1a6e9fe82b46159af8cc4cf34fb51ee47862f05;p=firefly-linux-kernel-4.4.55.git

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
---

c1a6e9fe82b46159af8cc4cf34fb51ee47862f05