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

Browse source

...

This commit is contained in:

Keith Packard 2011-06-26 19:12:00 -07:00

parent 93dbb29b47 7c9017e5b7

commit 8bc47de335

2 changed files with 225 additions and 83 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

3

drivers/gpu/drm/i915/i915_drv.h

View file

305

drivers/gpu/drm/i915/intel_display.c

View file