Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 1 Mar 2011 23:20:20 +0000 (23:20 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 1 Mar 2011 23:20:20 +0000 (23:20 +0000)
commit8d3c3ddfa85837e24fad6fa39318617cbb59e843
treef699dcaac2a11f0c9506ad111ae39fd5e3617c2d
parente8b2c3c47a53348aebbbeb5322e32937df958793
parent6927faf30920b8c03dfa007e732642a1f1f20089
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_gem_tiling.c
drivers/gpu/drm/i915/intel_display.c