diff options
author | Eric Anholt <eric@anholt.net> | 2010-05-07 14:30:03 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-05-10 13:36:52 -0700 |
commit | 34dc4d4423dc342848d72be764832cbc0852854a (patch) | |
tree | 056402a4afc2b7ef2f4dee30a712ce847279c13a /drivers/gpu/drm/i915/intel_bios.c | |
parent | 3d8620cc5f8538364ee152811e2bd8713abb1d58 (diff) | |
parent | 722154e4cacf015161efe60009ae9be23d492296 (diff) |
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.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.c')
0 files changed, 0 insertions, 0 deletions