]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Tue, 21 Jun 2011 19:02:57 +0000 (12:02 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 21 Jun 2011 19:02:57 +0000 (12:02 -0700)
1  2 
drivers/gpu/drm/i915/i915_gem.c

Simple merge