Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 7 Dec 2010 23:00:20 +0000 (23:00 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 7 Dec 2010 23:02:08 +0000 (23:02 +0000)
commit1a1c69762a14f50dd574a9cbabbfa1b1542f580e
tree117fc29dc9f936f0125e08206c9a60a4e5ffbad7
parent0be732841fb925b6f1242211ea211c022b6ac26c
parent1b39d6f37622f1da70aa2cfd38bfff9a52c13e05
Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_lvds.c
drivers/gpu/drm/i915/intel_ringbuffer.c