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-11-30 09:18:01 +11:00
2010-10-15 15:53:27 +02:00
2010-08-10 13:47:40 -07:00
2010-10-14 14:48:12 -04:00
2010-08-10 13:47:40 -07:00
2010-10-22 10:20:02 -07:00
2010-10-15 15:53:27 +02:00
2010-10-15 15:53:27 +02:00
2010-10-15 15:53:27 +02:00
2010-08-10 13:47:40 -07:00
2009-02-22 09:23:02 -08:00
2010-10-15 15:53:27 +02:00
2010-10-22 10:20:02 -07:00