Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 15 Nov 2010 06:33:11 +0000 (06:33 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 15 Nov 2010 06:33:11 +0000 (06:33 +0000)
1  2 
drivers/gpu/drm/i915/i915_gem.c

Simple merge