Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 3 Oct 2010 09:56:11 +0000 (10:56 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Sun, 3 Oct 2010 09:56:11 +0000 (10:56 +0100)
commit58e10eb92d36a62568349d985c9140d9be16a99c
tree6ffaf65e64db390f6a28c1dca8c43d4eb1493f94
parent1cdf7fef793c715d8c4998575aba3741fa4a0b01
parentab7ad7f6451580aa7eccc0ba62807c872088a8f9
Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_gem_evict.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_evict.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_tv.c