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

Browse source

...

This commit is contained in:

Keith Packard 2011-06-29 20:38:41 -07:00

parent e489bda422 f71d4af4cd

commit bee4d4acf5

5 changed files with 70 additions and 94 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

31

drivers/gpu/drm/i915/i915_dma.c

View file

8

drivers/gpu/drm/i915/i915_drv.c

View file

30

drivers/gpu/drm/i915/i915_drv.h

View file

78

drivers/gpu/drm/i915/i915_irq.c

View file

17

drivers/gpu/drm/i915/intel_overlay.c

View file