Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 28 Nov 2010 15:37:17 +0000 (15:37 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Sun, 28 Nov 2010 15:37:17 +0000 (15:37 +0000)
commit3619df035ec9280314fae44032a6167f16ec38d2
tree7b486292be5fe083701fec52d96faec0f9775ace
parent602606a472963a67b234e6b5c99293de4aa9d06b
parentde18a29e0fa3904894b4e02fae0e712cd43f740c
Merge branch 'drm-intel-fixes' into drm-intel-next

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