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

Browse source

...

This commit is contained in:

Keith Packard 2011-06-29 13:47:53 -07:00

parent 1c70c0cebd dc501fbc43

commit e489bda422

3 changed files with 23 additions and 14 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

16

drivers/gpu/drm/i915/i915_debugfs.c

View file

2

drivers/gpu/drm/i915/i915_drv.h

View file

19

drivers/gpu/drm/i915/i915_suspend.c

View file