Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Mon, 27 Jun 2011 02:12:00 +0000 (19:12 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 27 Jun 2011 02:12:00 +0000 (19:12 -0700)
commit8bc47de33569a111092a48465eb26cd855117e27
tree458987145929e8bedc09c17a1122b6db7f14dcb2
parent93dbb29b471c80e09df8bfde9c661df074ec82cc
parent7c9017e5b77118439952fe8dc22809bae4fae4b6
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c