Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 22 Nov 2010 08:51:36 +0000 (08:51 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 22 Nov 2010 08:51:36 +0000 (08:51 +0000)
Conflicts:
drivers/gpu/drm/i915/i915_gem.c


Trivial merge