summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2013-06-25 21:51:52 +0000
committerdelphij <delphij@FreeBSD.org>2013-06-25 21:51:52 +0000
commit524046622706f82ee0244247e5a37dc1c966856f (patch)
tree274be2c80fdd18de86dc5f343a1107ad7c7af187 /cddl
parent19d363377edf8cabee817f718377a6bc63ff7feb (diff)
downloadFreeBSD-src-524046622706f82ee0244247e5a37dc1c966856f.zip
FreeBSD-src-524046622706f82ee0244247e5a37dc1c966856f.tar.gz
Diff reduction against Illumos, no real change to code itself.
This marks vendor branch revision 252213 as merged, the actual code was committed in r245479. MFC after: 1 week
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
index 6af5f77..71b27a1 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
@@ -22,6 +22,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
*/
/*
OpenPOWER on IntegriCloud