Dave Airlie 8d4ad9d4bb Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next ... Merge drm-fixes into drm-next. Both i915 and radeon need this done for later patches. Conflicts: drivers/gpu/drm/drm_crtc_helper.c drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/i915_gem_gtt.c		2014-06-05 20:28:59 +10:00
..
ipu-v3	imx-drm: ipu-dmfc: Remove unneeded 'dmfc' check	2014-02-28 14:56:33 -08:00
Kconfig	imx-drm: parallel-display: Add drm_panel support	2014-02-27 12:43:36 -08:00
Makefile	imx-drm: remove imx-fb.c	2014-02-24 12:07:39 +00:00
TODO	staging: imx-drm: Update TODO	2014-03-07 16:18:01 +00:00
imx-drm-core.c	Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next	2014-06-05 20:28:59 +10:00
imx-drm.h	drm: make mode_valid callback optional	2014-04-22 11:18:12 +02:00
imx-hdmi.c	drm: make mode_valid callback optional	2014-04-22 11:18:12 +02:00
imx-hdmi.h	imx-drm: Add mx6 hdmi transmitter support	2013-12-08 17:23:18 -08:00
imx-ldb.c	drm: make mode_valid callback optional	2014-04-22 11:18:12 +02:00
imx-tve.c	Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next	2014-06-05 20:28:59 +10:00
ipuv3-crtc.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-04-08 09:52:16 -07:00
ipuv3-plane.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-04-08 09:52:16 -07:00
ipuv3-plane.h	staging: drm/imx: add drm plane support	2013-10-11 15:30:33 -07:00
parallel-display.c	drm: make mode_valid callback optional	2014-04-22 11:18:12 +02:00