]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 15 Nov 2010 06:49:30 +0000 (06:49 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 15 Nov 2010 06:49:30 +0000 (06:49 +0000)
commit0fb92f4ae86cf19b9bda492b5608a145743a78a9
tree3281184f026cb79cee6c20fe29c994ba654cbbe4
parent07a7ac38968bdf7bed99498ace56d51df1ebfa39
parent5c2a367dec873ac4aa8ce14772ca40eecf1302c0
Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_i2c.c