Daniel Vetter ff5f4b0585 Merge remote-tracking branch 'airlied/drm-next' into for-airlied ... Manually resolve the conflict between the new enum drm property helpers in drm-next and the new "force-dvi" option that the "audio" output property gained in drm-intel-next. While resolving this conflict, switch the new drm_prop_enum_list to use the newly introduced enum defines instead of magic values. Conflicts: drivers/gpu/drm/i915/intel_modes.c Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2012-02-23 14:56:11 +01:00
..
i2c	drm: Import driver for the sil164 I2C TMDS transmitter.	2010-08-02 10:21:13 +10:00
ttm	ttm: fix agp since ttm tt rework	2012-01-06 09:34:03 +00:00
Kbuild	drm: Install drm_fourcc.h	2011-12-20 10:02:02 +00:00
drm.h	drm: add some caps for userspace to discover more info for dumb KMS driver (v2)	2012-02-16 18:35:11 +00:00
drmP.h	drm: Fix authentication kernel crash	2012-01-25 09:27:45 +00:00
drm_buffer.h	drm: Add generic multipart buffer.	2010-02-23 09:46:20 +10: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	drm: add some caps for userspace to discover more info for dumb KMS driver (v2)	2012-02-16 18:35:11 +00:00
drm_crtc_helper.h	drm: Add drm_format_num_planes() utility function	2011-12-20 20:34:32 +00:00
drm_dp_helper.h	drm/radeon/kms: properly set panel mode for eDP	2011-11-01 16:01:58 +00:00
drm_edid.h	drm: support routines for HDMI/DP ELD	2011-09-21 14:52:41 -07:00
drm_encoder_slave.h	drm/kms: no need to return void value (encoder)	2009-08-19 16:06:49 +10:00
drm_fb_helper.h	drm fb helper: remove unused variable crtc_id	2012-02-03 09:55:52 +00:00
drm_fixed.h	drm: move radeon_fixed.h to shared drm_fixed.h header	2010-05-18 18:21:33 +10:00
drm_fourcc.h	drm: Add multi buffer plane pixel formats	2011-12-29 11:21:42 +09:00
drm_global.h	drm: move ttm global code to core drm	2010-08-04 09:46:06 +10:00
drm_hashtab.h	drm: Remove unused members from struct drm_open_hash	2011-02-23 11:16:40 +10:00
drm_mem_util.h	drm/ttm: use drm calloc large and free large	2010-03-15 10:31:43 +10:00
drm_memory.h	includecheck fix: include/drm, drm_memory.h	2009-09-20 16:02:58 +05:30
drm_mm.h	drm: mm: fix debug output	2011-05-09 09:14:45 +10:00
drm_mode.h	Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next	2011-12-20 14:43:53 +00:00
drm_os_linux.h	drm/i915: add i915_lp_ring_sync helper	2009-11-05 14:47:07 -08:00
drm_pciids.h	drm/radeon/kms: add some new pci ids	2011-12-14 12:29:03 +00:00
drm_sarea.h	drm: move to kref per-master structures.	2008-12-29 17:47:22 +10: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
exynos_drm.h	drm/exynos: added hdmi display support	2011-12-29 11:21:42 +09:00
gma_drm.h	gma500: Move the API	2011-12-06 09:54:23 +00:00
i810_drm.h	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00
i915_drm.h	drm/i915: add a LLC feature flag in device description	2012-01-17 20:01:45 +01:00
intel-gtt.h	agp/intel-gtt: export the gtt pagetable iomapping	2012-02-09 21:24:18 +01:00
mga_drm.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
nouveau_drm.h	drm/nv50: support for compression	2011-02-25 06:46:07 +10:00
r128_drm.h	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00
radeon_drm.h	drm/radeon: add support for evergreen/ni tiling informations v11	2012-02-13 12:28:13 +00:00
savage_drm.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
sis_drm.h	drm/sis: track obj->drm_fd relations in the driver	2011-12-22 00:33:15 +01:00
via_drm.h	drm/via: track obj->drm_fd relations in the driver	2011-12-22 00:33:19 +01:00
vmwgfx_drm.h	vmwgfx: Reinstate the update_layout ioctl	2011-11-02 08:30:31 +00:00