Dave Airlie 3ff99164f6 Merge remote branch 'anholt/drm-intel-next' into drm-linus ... This merges the upstream Intel tree and fixes up numerous conflicts due to patches merged into Linus tree later in -rc cycle. Conflicts: drivers/char/agp/intel-agp.c drivers/gpu/drm/drm_dp_i2c_helper.c drivers/gpu/drm/i915/i915_irq.c drivers/gpu/drm/i915/i915_suspend.c		2009-12-08 14:03:47 +10:00
..
dvo_ch7xxx.c	drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS in DVO output code.	2009-11-05 14:47:12 -08:00
dvo_ch7017.c	drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS in DVO output code.	2009-11-05 14:47:12 -08:00
dvo_ivch.c	drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS in DVO output code.	2009-11-05 14:47:12 -08:00
dvo_sil164.c	drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS in DVO output code.	2009-11-05 14:47:12 -08:00
dvo_tfp410.c	drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS in DVO output code.	2009-11-05 14:47:12 -08:00
dvo.h	drm/i915: Change I2C api to pass around i2c_adapters	2009-06-18 15:53:57 -07:00
i915_debugfs.c	drm/i915: Fix product names and #defines	2009-12-07 14:55:56 -08:00
i915_dma.c	drm/i915: Fix product names and #defines	2009-12-07 14:55:56 -08:00
i915_drv.c	drm: Add async event synchronization for drmWaitVblank	2009-11-18 10:02:47 +10:00
i915_drv.h	Merge remote branch 'anholt/drm-intel-next' into drm-linus	2009-12-08 14:03:47 +10:00
i915_gem_debug.c	drm/i915: Catch up to obj_priv->page_list rename in disabled debug code.	2009-06-22 20:19:39 -07:00
i915_gem_tiling.c	drm/i915: Fix product names and #defines	2009-12-07 14:55:56 -08:00
i915_gem.c	drm/i915: Fix product names and #defines	2009-12-07 14:55:56 -08:00
i915_ioc32.c
i915_irq.c	Merge remote branch 'anholt/drm-intel-next' into drm-linus	2009-12-08 14:03:47 +10:00
i915_mem.c	drm: Remove memory debugging infrastructure.	2009-06-18 13:00:33 -07:00
i915_opregion.c	drm/i915: Fix product names and #defines	2009-12-07 14:55:56 -08:00
i915_reg.h	drm/i915: Fix product names and #defines	2009-12-07 14:55:56 -08:00
i915_suspend.c	Merge remote branch 'anholt/drm-intel-next' into drm-linus	2009-12-08 14:03:47 +10:00
i915_trace_points.c	drm/i915: Add tracepoints	2009-09-23 01:05:21 +01:00
i915_trace.h	drm/i915: Enable irq to trace batch buffer completion.	2009-09-29 03:15:25 +01:00
intel_bios.c	drm/i915: Fix product names and #defines	2009-12-07 14:55:56 -08:00
intel_bios.h	drm/i915: parse child device from VBT	2009-11-30 16:36:53 -08:00
intel_crt.c	Merge remote branch 'anholt/drm-intel-next' into drm-linus	2009-12-08 14:03:47 +10:00
intel_display.c	Merge remote branch 'anholt/drm-intel-next' into drm-linus	2009-12-08 14:03:47 +10:00
intel_dp.c	Merge remote branch 'anholt/drm-intel-next' into drm-linus	2009-12-08 14:03:47 +10:00
intel_drv.h	drm/i915: Fix DDC on some systems by clearing BIOS GMBUS setup.	2009-12-01 11:56:30 -08:00
intel_dvo.c	drm/i915: Set crtc/clone mask in different output devices	2009-08-24 17:01:33 -07:00
intel_fb.c	drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS	2009-11-05 14:47:11 -08:00
intel_hdmi.c	drm/i915: Fix product names and #defines	2009-12-07 14:55:56 -08:00
intel_i2c.c	drm/i915: Fix product names and #defines	2009-12-07 14:55:56 -08:00
intel_lvds.c	drm/i915: Fix product names and #defines	2009-12-07 14:55:56 -08:00
intel_modes.c	drm/i915: Change I2C api to pass around i2c_adapters	2009-06-18 15:53:57 -07:00
intel_overlay.c	drm/i915: Fix product names and #defines	2009-12-07 14:55:56 -08:00
intel_sdvo_regs.h	drm/i915: enable sdvo lvds scaling function.	2009-07-01 11:44:45 -07:00
intel_sdvo.c	drm/i915: Add 30ms delay to make SDVO TV detection reliable.	2009-12-01 10:33:12 -08:00
intel_tv.c	drm/i915: Declare the new VBT parsing functions as static	2009-12-01 23:27:20 -08:00
Makefile	Merge remote branch 'anholt/drm-intel-next' into drm-linus	2009-12-08 14:03:47 +10:00