Chris Wilson 8a327f23e2 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
2011-01-24 18:27:32 +00:00
..
2010-10-15 15:53:27 +02:00
2010-08-10 13:47:40 -07:00
2010-08-10 13:47:40 -07:00
2011-01-20 17:02:14 -08:00
2010-10-15 15:53:27 +02:00
2010-10-15 15:53:27 +02:00
2011-01-13 08:03:23 -08:00
2010-12-17 15:18:05 +01:00
2010-08-10 13:47:40 -07:00
2009-02-22 09:23:02 -08:00
2011-01-10 08:51:44 -08:00
2010-10-15 15:53:27 +02:00
2010-10-22 10:20:02 -07:00