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)
commit46168f39360f419e59952d58cd08a862886ec8cd
tree8450cb9e31300e6bc2890f6706bf3953b7eb9949
parent085ce2643713830cf772c12c1a16da9d0ba83f36
parent16a02cf08a2de0863daf7ebb91718d7c6bbe7f9c
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c