Module Name: src Committed By: riastradh Date: Mon Aug 27 06:25:06 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_tiling.c
Log Message:
Forgot to nix conflicts after moving changes to i915_gem_fence.c.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_tiling.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
