]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 28 Nov 2010 15:37:17 +0000 (15:37 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Sun, 28 Nov 2010 15:37:17 +0000 (15:37 +0000)
commit0265a51abe2c76217ccc29871abb3888d58ea88b
tree7b486292be5fe083701fec52d96faec0f9775ace
parent74622c6137301394dabcd71f159514dd59135050
parent78c311aaa0afa710f443b5830e7f7c84171d7bf3
Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem.c