Merge remote branch 'origin/master' into drm-intel-next
authorEric Anholt <eric@anholt.net>
Fri, 7 May 2010 21:30:03 +0000 (14:30 -0700)
committerEric Anholt <eric@anholt.net>
Mon, 10 May 2010 20:36:52 +0000 (13:36 -0700)
commit34dc4d4423dc342848d72be764832cbc0852854a
tree056402a4afc2b7ef2f4dee30a712ce847279c13a
parent3d8620cc5f8538364ee152811e2bd8713abb1d58
parent722154e4cacf015161efe60009ae9be23d492296
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.
16 files changed:
drivers/gpu/drm/drm_sysfs.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/radeon/atombios.h
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/r420.c
drivers/gpu/drm/radeon/radeon_atombios.c
drivers/gpu/drm/radeon/radeon_connectors.c
drivers/gpu/drm/radeon/radeon_display.c
drivers/gpu/drm/radeon/radeon_mode.h