Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Thu, 30 Jun 2011 03:38:41 +0000 (20:38 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 30 Jun 2011 03:38:41 +0000 (20:38 -0700)
commitbee4d4acf563f91a7796cca53111d91be2532935
tree07dfe29a6404bc0bfab12232f2da8ba6a3eec267
parente489bda422b0a2c2cc33e598a4d400dfe654ad64
parentf71d4af4cd475aced6d9ec9730b03885ac80b833
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_overlay.c