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

Browse source

...

This commit is contained in:

Chris Wilson 2010-11-04 09:40:36 +00:00

parent 085ce26437 16a02cf08a

commit 46168f3936

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

1

drivers/gpu/drm/i915/i915_drv.h

View file

4

drivers/gpu/drm/i915/i915_suspend.c

View file

61

drivers/gpu/drm/i915/intel_display.c

View file

1

drivers/gpu/drm/i915/intel_drv.h

View file