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)
commit9b546e571b94cacccf1091cc9cc0bd8a6a207a66
treefd50ef5eae6b8283e26926fa5d664f7e1cd88920
parent2c1756b12edc19fdd75c833699cb752e1bbb641e
parentcda2bb78c24de7674eafa3210314dc75bed344a6
Merge branch 'drm-intel-fixes' into drm-intel-next
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