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

Browse source

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/intel_dp.c

...

This commit is contained in:

Chris Wilson 2010-12-07 23:00:20 +00:00

parent 0be732841f 1b39d6f376

commit 1a1c69762a

4 changed files with 91 additions and 61 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

17

drivers/gpu/drm/i915/i915_gem.c

View file

7

drivers/gpu/drm/i915/intel_dp.c

View file

100

drivers/gpu/drm/i915/intel_lvds.c

View file

30

drivers/gpu/drm/i915/intel_ringbuffer.c

View file