Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 9 Dec 2010 20:22:04 +0000 (20:22 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 9 Dec 2010 20:22:04 +0000 (20:22 +0000)
commit8d5203ca62539c6ab36a5bc2402c2de1de460e30
treedd0c5815cea7134904855bef8d81a9b31e45c06b
parent8fd2685911cb6c140e6d0588ac04990ce65d4537
parent63abf3edaf42d0b9f278df90fe41c7ed4796b6b1
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/intel_ringbuffer.h