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
..
bridge	drm/bridge/ptn3460: fix modular build	2014-03-24 09:21:15 +10:00
i2c	drm/i2c: tda998x: add video and audio input configuration	2013-08-19 09:10:32 +10:00
ttm	drm/ttm: add reservation_object as argument to ttm_bo_init	2014-09-30 14:04:00 +02:00
ati_pcigart.h	drm: Move legacy buffer structures to <drm/drm_legacy.h>	2014-09-12 15:28:12 +02:00
drm_agpsupport.h	drm: move remaining includes in drmP.h to the top	2014-09-10 17:42:03 +10:00
drm_atomic_helper.h	drm/atomic-helpers: functions for state duplicate/destroy/reset	2014-11-06 21:02:23 +01:00
drm_atomic.h	drm/atomic: Refcounting for plane_state->fb	2014-11-06 21:08:37 +01:00
drm_cache.h
drm_core.h
drm_crtc_helper.h	drm/crtc-helper: Transitional functions using atomic plane helpers	2014-11-05 18:44:59 +01:00
drm_crtc.h	drm/atomic: Integrate fence support	2014-11-06 21:02:22 +01:00
drm_dp_helper.h	Merge tag 'topic/core-stuff-2014-11-05' of git://anongit.freedesktop.org/drm-intel into drm-next	2014-11-07 10:58:46 +10:00
drm_dp_mst_helper.h	Merge tag 'topic/core-stuff-2014-11-05' of git://anongit.freedesktop.org/drm-intel into drm-next	2014-11-07 10:58:46 +10:00
drm_edid.h	drm/edid: add #defines and helpers for ELD	2014-11-05 14:03:44 +01:00
drm_encoder_slave.h	drm: i2c encoder helper wrappers	2013-02-17 17:55:42 -05:00
drm_fb_cma_helper.h	drm: Make drm_fb_cma_describe() static	2013-08-21 12:47:41 +10:00
drm_fb_helper.h	drm: Perform cmdline mode parsing during connector initialisation	2014-08-06 14:50:12 +02:00
drm_fixed.h	drm: fix 64 bit drm fixed point helpers	2013-07-30 17:24:13 -04:00
drm_flip_work.h	drm: Fixup flip-work kerneldoc	2014-04-29 12:33:35 +02:00
drm_gem_cma_helper.h	drm: Pass dma-buf as argument to gem_prime_import_sg_table	2014-09-30 14:04:00 +02:00
drm_gem.h	drm: Extract <drm/drm_gem.h>	2014-09-24 11:43:41 +10:00
drm_global.h
drm_hashtab.h	drm: Add a hash-tab rcu-safe API	2012-11-28 18:36:05 +10:00
drm_legacy.h	drm: move drm_mmap to <drm/drm_legacy.h>	2014-09-24 11:43:07 +10:00
drm_mem_util.h	introduce SIZE_MAX	2012-05-31 17:49:26 -07:00
drm_mipi_dsi.h	drm/mipi-dsi: consider low power transmission	2014-09-20 00:56:08 +09:00
drm_mm.h	drm: Add support for two-ended allocation, v3	2014-04-04 09:28:14 +10:00
drm_modes.h	drm: try harder to avoid regression when merging mode bits	2014-05-01 09:26:53 +10:00
drm_modeset_lock.h	drm/modeset_lock: document trylock_only in kerneldoc	2014-11-05 17:23:16 +01:00
drm_of.h	drm: add of_graph endpoint helper to find possible CRTCs	2014-07-11 15:38:28 +01:00
drm_os_linux.h	drm: Kill DRM_SUSER	2013-12-18 11:35:45 +10:00
drm_panel.h	drm/panel: Provide convenience wrapper for .get_modes()	2014-08-06 16:44:09 +02:00
drm_pciids.h	drm/radeon: remove invalid pci id	2014-10-28 10:44:36 -04:00
drm_plane_helper.h	drm/crtc-helper: Transitional functions using atomic plane helpers	2014-11-05 18:44:59 +01:00
drm_rect.h	drm: Add drm_rect rotation functions	2014-07-11 23:44:12 +02:00
drm_sysfs.h
drm_vma_manager.h	drm: init TTM dev_mapping in ttm_bo_device_init()	2014-03-16 12:23:42 +01:00
drmP.h	drm: drm_err: Remove unnecessary __func__ argument	2014-10-12 20:57:16 +02:00
exynos_drm.h	drm/exynos: fimd: replace struct fb_videomode with videomode	2013-09-05 13:43:44 +09:00
gma_drm.h	drm/gma500: Remove unused ioctls	2014-03-17 20:11:57 +01:00
i915_drm.h	x86/gpu: Add Intel graphics stolen memory quirk for gen2 platforms	2014-02-09 15:11:30 +01:00
i915_pciids.h	drm/i915/skl: Add the Skylake PCI ids	2014-09-24 14:32:14 +02:00
i915_powerwell.h	drm/i915: provide interface for audio driver to query cdclk	2014-07-04 07:46:09 +02:00
intel-gtt.h	drm/i915: Fix gen2 mappable calculations	2013-02-15 10:30:38 +01:00