Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 20 Jan 2011 09:40:42 +0000 (09:40 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 20 Jan 2011 09:41:07 +0000 (09:41 +0000)
Apply the SandyBridge stability fixes from -fixes.

1  2 
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c

Simple merge
Simple merge