---
- branch: MAIN
  date: Mon Aug 27 06:25:06 UTC 2018
  files:
  - new: '1.6'
    old: '1.5'
    path: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_tiling.c
    pathrev: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_tiling.c@1.6
    type: modified
  id: 20180827T062506Z.7d643301a6ad7b1018d433cbddb93e3fae614587
  log: |
    Forgot to nix conflicts after moving changes to i915_gem_fence.c.
  module: src
  subject: 'CVS commit: src/sys/external/bsd/drm2/dist/drm/i915'
  unixtime: '1535351106'
  user: riastradh