Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 5 Dec 2010 10:43:39 +0000 (10:43 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Sun, 5 Dec 2010 10:43:39 +0000 (10:43 +0000)
commit5aa7d52aebfc11760bbc5b081ed621227bb77981
tree1bb2542ff9f8f58599325a68f3861f80be27bf26
parent382ab78c0e4866eb9a812e9ba20d0f876d9634d6
parentbbf0c6b3620b3872929ef7d3c392ce436889110f
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
drivers/char/agp/intel-gtt.c
drivers/gpu/drm/i915/i915_dma.c