Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Thu, 7 Jul 2011 22:39:51 +0000 (15:39 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 7 Jul 2011 22:39:51 +0000 (15:39 -0700)
1  2 
drivers/gpu/drm/i915/i915_drv.c

Simple merge