CVS commit: src/sys/external/bsd/drm2/dist/drm/i915

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    src
Committed By:   riastradh
Date:           Mon Aug 27 07:29:50 UTC 2018

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915: intel_ringbuffer.c

Log Message:
Fix up some borken merges.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
    src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.