Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 23 Nov 2010 20:13:13 +0000 (20:13 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 23 Nov 2010 20:13:13 +0000 (20:13 +0000)
commite384eafc1c2f4f10155fe25324afe51129ec3e6a
tree4a2081bb992af5a2a195e741b5feb16b46e6ebd0
parentfaa60c4174d943696b9478c5de6438c4f0fecba6
parentbcf50e2775bbc3101932d8e4ab8c7902aa4163b4
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_gem.c