Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Thu, 28 Jul 2011 23:30:41 +0000 (16:30 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 28 Jul 2011 23:30:41 +0000 (16:30 -0700)
commit2c1756b12edc19fdd75c833699cb752e1bbb641e
tree2893f6f8b59bfea0e295877643dc29849a7d1a67
parentcf96e46fcd147856fd8151fab91c410f0ec16c47
parentd74362c9e45689d8d7e3d4bcf6681c4358ef4f2e
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c