Module Name: src Committed By: kre Date: Sun Jan 27 05:00:48 UTC 2019
Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Fix merge botch. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.35 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.36 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.35 Sun Jan 27 02:08:42 2019 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Jan 27 05:00:48 2019 @@ -1,6 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.35 2019/01/27 02:08:42 pgoyette Exp $ - -version 20180827 +# $NetBSD: files.i915drmkms,v 1.36 2019/01/27 05:00:48 kre Exp $ version 20180827