]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
projects / FreeBSD / stable / 10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b5138fa) | patch
Fix a missed merge introduced in r272883.
authordelphij <delphij@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Mon, 13 Oct 2014 18:46:30 +0000 (18:46 +0000)
committerdelphij <delphij@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Mon, 13 Oct 2014 18:46:30 +0000 (18:46 +0000)
commit924ba1476ddb50d9ba7cf3b49c819ad4bfe47b3f
tree0f2ec602295322ef5442b595bed7870b6347da26tree | snapshot
parentb5138fa932f333b654bdd46dd903528f68405ebccommit | diff
Fix a missed merge introduced in r272883.

git-svn-id: svn://svn.freebsd.org/base/stable/10@273057 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c diff | blob | history
10-STABLE