tree 1bb2542ff9f8f58599325a68f3861f80be27bf26
parent 382ab78c0e4866eb9a812e9ba20d0f876d9634d6
parent bbf0c6b3620b3872929ef7d3c392ce436889110f
author Chris Wilson <chris@chris-wilson.co.uk> 1291545819 +0000
committer Chris Wilson <chris@chris-wilson.co.uk> 1291545819 +0000

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