]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 22 Nov 2010 08:51:36 +0000 (08:51 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 22 Nov 2010 08:51:36 +0000 (08:51 +0000)
commit990806b9844b60e830f49ac263ce2fdd70e1258f
treee2b9804379a6aab3d2471898d257fe5590feb70c
parented93b9c4bbdefbc3495174b959a22aab815d7653
parentb1b586d628713077d2f7a1b54c64d813ae76902f
Merge branch 'drm-intel-fixes' into drm-intel-next

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