| commit | 8a327f23e23fa509e6e3c2263ae1cc0a67dec387 | [log] [tgz] |
|---|---|---|
| author | Chris Wilson <chris@chris-wilson.co.uk> | Sun Jan 23 17:22:16 2011 +0000 |
| committer | Chris Wilson <chris@chris-wilson.co.uk> | Mon Jan 24 18:27:32 2011 +0000 |
| tree | 119abf09e1ec9babaf78e6889187f9d54864b118 | |
| parent | 5a9a8d1a99c617df82339456fbdd30d6ed3a856b [diff] | |
| parent | d315777b32a4696feb86f2a0c9e9f39c94683649 [diff] |
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