[src/trunk]: src/sys/ufs/lfs ufs/inode.h -r1.67 is effectively merged into he...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0be900544497
branches:  trunk
changeset: 346008:0be900544497
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Jun 20 01:06:23 2016 +0000

description:
ufs/inode.h -r1.67 is effectively merged into here too.

diffstat:

 sys/ufs/lfs/lfs_inode.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (12 lines):

diff -r 033ba51abdbf -r 0be900544497 sys/ufs/lfs/lfs_inode.h
--- a/sys/ufs/lfs/lfs_inode.h   Mon Jun 20 01:05:36 2016 +0000
+++ b/sys/ufs/lfs/lfs_inode.h   Mon Jun 20 01:06:23 2016 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: lfs_inode.h,v 1.13 2016/06/20 00:18:40 dholland Exp $  */
+/*     $NetBSD: lfs_inode.h,v 1.14 2016/06/20 01:06:23 dholland Exp $  */
 /*  from NetBSD: ulfs_inode.h,v 1.5 2013/06/06 00:51:50 dholland Exp  */
-/*  from NetBSD: inode.h,v 1.66 2014/05/08 08:21:53 hannken Exp  */
+/*  from NetBSD: inode.h,v 1.67 2014/05/14 13:46:19 martin Exp  */
 
 /*
  * Copyright (c) 1982, 1989, 1993