Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Fri, 29 Jul 2011 23:24:10 +0000 (16:24 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 29 Jul 2011 23:24:10 +0000 (16:24 -0700)
1  2 
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/i915_suspend.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_hdmi.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge