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-Tag: v3.9-rc1~83^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca18e1426bb2db987b67030256477c9571aebd09;p=pandora-kernel.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
Reading git-diff-tree failed