kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-09-26 18:16:26 +00:00
Code Issues Releases Packages Activity

Merge remote branch 'origin/master' into drm-intel-next

Browse source 
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.
This commit is contained in:
Eric Anholt 2010-05-07 14:30:03 -07:00
commit 34dc4d4423
589 changed files with 8519 additions and 3084 deletions
Download patch file Download diff file Expand all files Collapse all files