Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Wed, 28 Sep 2011 21:44:38 +0000 (14:44 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 28 Sep 2011 21:44:38 +0000 (14:44 -0700)
1  2 
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_sdvo.c

Simple merge
Simple merge
Simple merge
Simple merge