leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
11bc82d67d1150767901bca54a24466621d763d7
linux/drivers/gpu/drm/i915/i915_gem_tiling.c
Chris Wilson 47ae63e0c2 Merge branch 'drm-intel-fixes' into drm-intel-next 
Apply the trivial conflicting regression fixes, but keep GPU semaphores
enabled.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_gem_execbuffer.c
2011-03-07 12:35:15 +00:00

15 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink