From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 23 Jan 2011 17:22:16 +0000 (+0000)
Subject: Merge remote branch 'linus/master' into drm-intel-fixes
X-Git-Tag: v2.6.38-rc3~65^2^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8a327f23e23fa509e6e3c2263ae1cc0a67dec387;p=linux.git

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
---

8a327f23e23fa509e6e3c2263ae1cc0a67dec387