diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-28 15:37:17 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-28 15:37:17 +0000 |
| commit | 3619df035ec9280314fae44032a6167f16ec38d2 (patch) | |
| tree | 7b486292be5fe083701fec52d96faec0f9775ace /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | drm/i915/execbuffer: On error, starting unwinding from the previous object (diff) | |
| parent | drm/i915: fix regression due to ba3d8d749b01548b9 (diff) | |
| download | linux-dev-3619df035ec9280314fae44032a6167f16ec38d2.tar.xz linux-dev-3619df035ec9280314fae44032a6167f16ec38d2.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
0 files changed, 0 insertions, 0 deletions