Daniel Vetter 967ad7f148 Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next ... The conflict in intel_drv.h tripped me up a bit since a patch in dinq moves all the functions around, but another one in drm-next removes a single function. So I'ev figured backing this into a backmerge would be good. i915_dma.c is just adjacent lines changed, nothing nefarious there. Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/intel_drv.h Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2013-10-10 12:44:43 +02:00
..
i2c	drm/i2c: tda998x: add video and audio input configuration	2013-08-19 09:10:32 +10:00
ttm	drm/ttm: convert to unified vma offset manager	2013-07-25 20:47:07 +10:00
drmP.h	Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next	2013-10-10 12:44:43 +02:00
drm_agpsupport.h	drm: provide agp dummies for CONFIG_AGP=n	2013-08-09 07:22:11 +10:00
drm_buffer.h	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
drm_cache.h	drm/ttm: consolidate cache flushing code in one place.	2009-08-27 09:53:47 +10:00
drm_core.h	drm: Fix support for PCI domains	2010-08-10 08:20:20 +10:00
drm_crtc.h	Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next	2013-10-10 12:44:43 +02:00
drm_crtc_helper.h	drm: extract drm_kms_helper_hotplug_event	2012-11-20 15:50:32 +10:00
drm_dp_helper.h	drm/dp: add helper for checking DP_ENHANCED_FRAME_CAP in DPCD	2013-10-09 18:17:06 +10:00
drm_edid.h	Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-next	2013-09-02 09:31:40 +10: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: Remove pointless '-' characters from drm_fb_helper documentation	2013-05-10 14:46:11 +10: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: add flip-work helper	2013-08-19 10:32:26 +10:00
drm_gem_cma_helper.h	drm/gem: create drm_gem_dumb_destroy	2013-08-07 09:59:24 +10:00
drm_global.h	drm: move ttm global code to core drm	2010-08-04 09:46:06 +10:00
drm_hashtab.h	drm: Add a hash-tab rcu-safe API	2012-11-28 18:36:05 +10:00
drm_mem_util.h	introduce SIZE_MAX	2012-05-31 17:49:26 -07:00
drm_memory.h	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
drm_mm.h	drm/mm: remove unused API	2013-08-07 10:16:50 +10:00
drm_os_linux.h	drm: Remove mtrr_add and mtrr_del fallback hack for non-MTRR systems	2013-05-31 13:37:37 +10:00
drm_pciids.h	drm/radeon: add some additional berlin pci ids	2013-09-11 11:44:30 -04:00
drm_rect.h	drm: Fix drm_rect documentation	2013-05-23 12:51:32 +02:00
drm_sysfs.h	drm: Enable drm drivers to add drm sysfs devices.	2009-08-19 16:08:51 +10:00
drm_usb.h	drm: add usb framework	2011-02-07 13:09:42 +10:00
drm_vma_manager.h	drm/vma: add access management helpers	2013-08-27 11:54:54 +10:00
exynos_drm.h	drm/exynos: fimd: replace struct fb_videomode with videomode	2013-09-05 13:43:44 +09:00
gma_drm.h	gma500: fix ioctl confict	2012-03-10 13:06:04 +00:00
i915_drm.h	x86: add early quirk for reserving Intel graphics stolen memory v5	2013-09-03 19:17:57 +02:00
i915_pciids.h	drm/i915: split PCI IDs out into i915_drm.h v4	2013-09-03 19:17:56 +02:00
i915_powerwell.h	i915/drm: Add private api for power well usage	2013-06-06 17:32:16 +02:00
intel-gtt.h	drm/i915: Fix gen2 mappable calculations	2013-02-15 10:30:38 +01:00