From: Dave Airlie <airlied@redhat.com>
Date: Wed, 20 Feb 2013 23:31:47 +0000 (+1000)
Subject: Merge branch 'tilcdc-next' of git://people.freedesktop.org/~robclark/linux into drm... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ca18e1426bb2db987b67030256477c9571aebd09;p=~shefty%2Frdma-dev.git

Merge branch 'tilcdc-next' of git://people.freedesktop.org/~robclark/linux into drm-next

KMS driver for TI LCD controller

* 'tilcdc-next' of git://people.freedesktop.org/~robclark/linux:
  drm/tilcdc: add support for LCD panels (v5)
  drm/tilcdc: add encoder slave (v2)
  drm/i2c: nxp-tda998x (v3)
  drm/tilcdc: add TI LCD Controller DRM driver (v4)
  drm/nouveau: use i2c encoder helper wrappers
  drm: i2c encoder helper wrappers
  drm/cma: add debugfs helpers
  drm: small fix in drm_send_vblank_event()
  drm: Don't set the plane->fb to NULL on successfull set_plane
  drm/cma-helper: fixup compilation

Conflicts:
	drivers/gpu/drm/Kconfig
	drivers/gpu/drm/Makefile
	drivers/gpu/drm/drm_fb_cma_helper.c
---

ca18e1426bb2db987b67030256477c9571aebd09
diff --cc drivers/gpu/drm/Kconfig
index 0ce5f52ac56,ba74e75f7d5..f8dae851130
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@@ -216,4 -216,4 +216,6 @@@ source "drivers/gpu/drm/shmobile/Kconfi
  
  source "drivers/gpu/drm/tegra/Kconfig"
  
 +source "drivers/gpu/drm/omapdrm/Kconfig"
++
+ source "drivers/gpu/drm/tilcdc/Kconfig"
diff --cc drivers/gpu/drm/Makefile
index b6b43cbc18e,3af934dffe6..0d59b24f8d2
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -50,5 -50,5 +50,6 @@@ obj-$(CONFIG_DRM_UDL) += udl
  obj-$(CONFIG_DRM_AST) += ast/
  obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
  obj-$(CONFIG_DRM_TEGRA) += tegra/
 +obj-$(CONFIG_DRM_OMAP)	+= omapdrm/
+ obj-$(CONFIG_DRM_TILCDC)	+= tilcdc/
  obj-y			+= i2c/