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

Browse source

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

...

This commit is contained in:

Chris Wilson 2010-11-28 15:37:17 +00:00

parent 602606a472 de18a29e0f

commit 3619df035e

3 changed files with 28 additions and 85 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

MAINTAINERS

View file

52

drivers/gpu/drm/i915/i915_gem.c

View file

59

drivers/gpu/drm/i915/intel_sdvo.c

View file