]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Wed, 29 Jun 2011 17:34:54 +0000 (10:34 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 29 Jun 2011 17:34:54 +0000 (10:34 -0700)
1  2 
drivers/gpu/drm/i915/i915_gem.c

Simple merge