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

Browse source

...

This commit is contained in:

Keith Packard 2011-09-28 14:44:38 -07:00

parent 64a742fac3 cd0de039bf

commit 0ac225e569

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

4

drivers/gpu/drm/i915/i915_drv.c

View file

12

drivers/gpu/drm/i915/intel_display.c

View file

3

drivers/gpu/drm/i915/intel_drv.h

View file

88

drivers/gpu/drm/i915/intel_sdvo.c

View file