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

Browse source

Apply the SandyBridge stability fixes from -fixes.

...

This commit is contained in:

Chris Wilson 2011-01-20 09:40:42 +00:00

parent 417ae1476d 4efe070896

commit fe4402931e

2 changed files with 30 additions and 1 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_reg.h

View file

25

drivers/gpu/drm/i915/intel_display.c

View file