]> CyberLeo.Net >> Repos - FreeBSD/stable/9.git/commit
fix a mismerge in r302751
authoravg <avg@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 13 Jul 2016 10:49:32 +0000 (10:49 +0000)
committeravg <avg@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 13 Jul 2016 10:49:32 +0000 (10:49 +0000)
commitc54b7785fca600260756f8ebdb1d22b20374b78a
tree66c5a81b8f6e54b3a1b5208d5749d7def5f49cab
parenta0ee75062fd5543ad544563ecb97372f50ca54ea
fix a mismerge in r302751

This is a direct commit.

git-svn-id: svn://svn.freebsd.org/base/stable/9@302757 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c