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
..
drm	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
vga	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-05-04 19:08:12 -07:00
Makefile	PCI/GPU: implement VGA arbitration on Linux	2009-09-09 13:29:36 -07:00