Merge branch 'drm-intel-fixes' into drm-intel-next

Browse source

Immediate merge to resolve conflicts from applying a stability fix to
both branches.

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c
	drivers/gpu/drm/i915/intel_ringbuffer.h

...

This commit is contained in:

Chris Wilson 2010-11-02 10:53:29 +00:00

parent 8d19215be8 5588978882

commit 8c1812ad48

2 changed files with 5 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/gpu/drm/i915/i915_drv.c

View file

9

drivers/gpu/drm/i915/intel_display.c

View file