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)
commit4a1dc3ff68807bf3c76563bf439166854d063adc
treef8b4f2933461424ff4ceb7d356e51ab98898b031
parent72557b4f326ac2f7d469ae5a35fab57e13d9a602
parent78c6e170badd22c86a5b50a7eb038a02024b8f03
Merge branch 'drm-intel-fixes' into drm-intel-next

Merge resume fixes from -fixes and an important fix for SDVO GMBUS.
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