Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 4 Nov 2010 09:40:36 +0000 (09:40 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 4 Nov 2010 09:40:36 +0000 (09:40 +0000)
1  2 
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c

Simple merge
Simple merge