Chris Wilson 5aa7d52aeb Merge branch 'drm-intel-fixes' into drm-intel-next
Immediate merge for the conflicting introduction of HAS_COHERENT_RINGS.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	include/drm/i915_drm.h
2010-12-05 10:43:39 +00:00
..
2010-08-10 08:20:20 +10:00
2010-08-05 09:22:31 -05:00
2010-07-21 11:19:45 +10:00
2010-08-04 09:46:06 +10:00
2010-11-23 20:14:44 +00:00
2010-11-23 20:14:47 +00:00