Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 11 Sep 2010 08:49:58 +0000 (09:49 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Sat, 11 Sep 2010 08:49:58 +0000 (09:49 +0100)
commit8b3016c4f4cded41d4d53da6f09f40efd6083f4f
tree9667a158b5309d1cc01094a6d5b7c40f3ea00636
parent021357acc8ea85273a9882b3fe89935629f51b12
parentdd8849c8f59ec1cee4809a0c5e603e045abe860e
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