Merge branch 'drm-intel-fixes' into drm-intel-next
Chris Wilson [Tue, 1 Mar 2011 23:20:20 +0000 (23:20 +0000)]
1  2 
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_gem_tiling.c
drivers/gpu/drm/i915/intel_display.c

Simple merge
Simple merge