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)
commit1bb95834bbcdc969e477a9284cf96c17a4c2616f
tree9cf66b22a611bb6bc78778c05dac72263bb45a23
parent85345517fe6d4de27b0d6ca19fef9d28ac947c4a
parenta41c73e04673b47730df682446f0d52f95e32a5b
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
drivers/gpu/drm/i915/i915_gem.c