From: Dave Airlie <airlied@redhat.com>
Date: Tue, 7 Oct 2014 04:31:14 +0000 (+1000)
Subject: Merge tag 'ipu-fixes-3.18' of git://git.pengutronix.de/git/pza/linux into drm-next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=46d987af7649ef9b2f1d1467b9249fb6e24d2658;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'ipu-fixes-3.18' of git://git.pengutronix.de/git/pza/linux into drm-next

IPUv3 fixes for v3.18

* tag 'ipu-fixes-3.18' of git://git.pengutronix.de/git/pza/linux:
  gpu: ipu-v3: Kconfig: Remove SOC_IMX6SL from IMX_IPUV3_CORE Kconfig
  gpu: ipu-v3: ipu-smfc: Do not leave DEBUG defined
  gpu: ipu-v3: Return proper error on ipu_add_client_devices error path
  gpu: ipu-v3: Select GENERIC_IRQ_CHIP to fix build error
---

46d987af7649ef9b2f1d1467b9249fb6e24d2658