Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 4 Oct 2010 09:07:38 +0000 (10:07 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 4 Oct 2010 09:07:38 +0000 (10:07 +0100)
commitdf6d075a4d8b151f2c011de01c09bdc92a7bb935
tree9579e31bc46c4c11580b57a32e2cc0baddeb1405
parentf87ea7613126ace98c0cb8b86f58e16a0e539375
parent7dcd2499deab8f10011713c40bc2f309c9b65077
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_gem.c