Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 1 Feb 2011 08:49:07 +0000 (08:49 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 1 Feb 2011 08:49:14 +0000 (08:49 +0000)
Merge resume fixes from -fixes and an important fix for SDVO GMBUS.

1  2 
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_sdvo.c

Simple merge
Simple merge
Simple merge
Simple merge