]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Code Review / linux-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(merge: 8d19215 5588978)
Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 2 Nov 2010 10:53:29 +0000 (10:53 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 2 Nov 2010 10:53:29 +0000 (10:53 +0000)
commit8c1812ad4879676bec1bd20f8ff478c8a076f3fc
tree71460f036f5ed4c1c130c041b0db95f12213baa4tree | snapshot
parent8d19215be8254f4f75e9c5a0d28345947b0382dbcommit | diff
parent5588978882b5f4b81169bd7f9bc941e3a12ee8bacommit | diff
Merge branch 'drm-intel-fixes' into drm-intel-next

Immediate merge to resolve conflicts from applying a stability fix to
both branches.

Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/intel_ringbuffer.h
drivers/gpu/drm/i915/i915_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_display.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.