Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Tue, 28 Jun 2011 17:29:47 +0000 (10:29 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 28 Jun 2011 17:29:47 +0000 (10:29 -0700)
1  2 
drivers/gpu/drm/i915/i915_gem.c

Simple merge