Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 5 Dec 2010 00:37:43 +0000 (00:37 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Sun, 5 Dec 2010 00:37:43 +0000 (00:37 +0000)
1  2 
drivers/gpu/drm/i915/intel_display.c

Simple merge