Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Fri, 22 Jul 2011 20:40:42 +0000 (13:40 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 22 Jul 2011 20:40:42 +0000 (13:40 -0700)
commitdf7976797fa9af161690dbf4dee81ed92cdc150f
treebe6f04706d91cc80da4dbd3a5f5f2a174f1bdae3
parentf0b69efc29b024747a88ce020dada425e3193d5a
parent9c54c0dd948d715ccfd79e97d852f80eeb53254a
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_ringbuffer.c