Eric Anholt 34dc4d4423 Merge remote branch 'origin/master' into drm-intel-next
Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/radeon/r300.c

The BSD ringbuffer support that is landing in this branch
significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
and requires it to be tested successfully anyway.
2010-05-10 13:36:52 -07:00
..
2008-10-17 14:40:53 -07:00
2009-12-04 15:39:57 +01:00
2009-05-15 07:56:25 -05:00
2007-05-08 11:15:15 -07:00
2008-02-07 08:42:16 -08:00
2008-10-30 11:38:47 -07:00
2007-05-22 23:45:48 -07:00