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

Browse source

...

This commit is contained in:

Keith Packard 2011-06-28 10:29:47 -07:00

parent 1e5216e438 f01c22fd59

commit 6ae77e6b6a

2 changed files with 5 additions and 2 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.c

View file

4

drivers/gpu/drm/i915/i915_gem.c

View file