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)
commite624ae8e0d4243e71daedce7570e91290438eaca
treee2b9804379a6aab3d2471898d257fe5590feb70c
parentc4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287
parent4ab0fbd3a29067e1540f05093ae4ed07645d18c8
Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_gem.c