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

Browse source

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

...

This commit is contained in:

Chris Wilson 2010-11-01 13:42:29 +00:00

parent 0f8c6d7ca9 c6afd65807

commit f2a630bfec

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

6

drivers/gpu/drm/i915/i915_gem.c

View file

4

drivers/gpu/drm/i915/i915_gem_evict.c

View file

2

drivers/gpu/drm/i915/intel_opregion.c

View file

4

drivers/gpu/drm/i915/intel_overlay.c

View file