Daniel Vetter 54499b2a92 Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued ... So with all the code movement and extraction in intel_pm.c in -next git is hopelessly confused with commit 2208d655a9 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Fri Nov 14 09:25:29 2014 +0100 drm/i915: drop WaSetupGtModeTdRowDispatch:snb from -fixes. Worse even small changes in -next move around the conflict context so rerere is equally useless. Let's just backmerge and be done with it. Conflicts: drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_pm.c Except for git getting lost no tricky conflicts really. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2014-11-19 18:17:38 +01:00
..
armada_510.c	drm/armada: update Armada 510 (Dove) to use "ext_ref_clk1" as the clock	2014-07-11 15:40:14 +01:00
armada_crtc.c	Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued	2014-11-19 18:17:38 +01:00
armada_crtc.h	drm/armada: register crtc with port	2014-07-11 20:34:47 +01:00
armada_debugfs.c	DRM: Armada: convert to use simple_open()	2013-11-06 12:02:36 +10:00
armada_drm.h	drm/armada: make variant a CRTC thing	2014-07-03 16:24:48 +01:00
armada_drv.c	Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-fixes	2014-10-28 10:03:34 +10:00
armada_fb.c
armada_fb.h
armada_fbdev.c	drm: Introduce drm_fb_helper_prepare()	2014-07-08 11:31:28 +10:00
armada_gem.c	dma-buf: use reservation objects	2014-07-08 13:03:20 -07:00
armada_gem.h	drm: Extract <drm/drm_gem.h>	2014-09-24 11:43:41 +10:00
armada_hw.h
armada_ioctlP.h
armada_output.c	drm: add register and unregister functions for connectors	2014-06-19 08:55:28 +02:00
armada_output.h
armada_overlay.c
armada_slave.c
armada_slave.h
Kconfig	DRM: armada: fix missing DRM_KMS_FB_HELPER select	2014-01-27 23:47:14 +00:00
Makefile