Merge remote branch 'linus/master' into drm-intel-fixes (8a327f23) · Commits · github.com / kvm-riscv / linux

Commit 8a327f23 authored Jan 23, 2011 by

Chris Wilson

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

parents 5a9a8d1a d315777b

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment