]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote branch 'linus/master' into drm-intel-fixes
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 23 Jan 2011 17:22:16 +0000 (17:22 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 24 Jan 2011 18:27:32 +0000 (18:27 +0000)
commit870a67fd3ea0362cd3ccb9fdfd58f3ec24a432c5
tree119abf09e1ec9babaf78e6889187f9d54864b118
parentd262a45521390feff7b354f12a92789cb93a32a4
parent96a0b02351a963608cadf79cf4cb6995a7e3c156
Merge remote branch 'linus/master' into drm-intel-fixes

Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().

Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/Kconfig