]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bbc192 c7750e8)
Merge tag 'ipu-fixes-3.18' of git://git.pengutronix.de/git/pza/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 7 Oct 2014 04:31:14 +0000 (14:31 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 7 Oct 2014 04:31:14 +0000 (14:31 +1000)
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

1  2 
drivers/gpu/ipu-v3/ipu-common.c patch | diff1 | diff2 | blob | history
drivers/gpu/ipu-v3/ipu-smfc.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/ipu-v3/ipu-common.c
Simple merge
diff --cc drivers/gpu/ipu-v3/ipu-smfc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.