diff options
| author | delphij <delphij@FreeBSD.org> | 2015-01-28 08:56:48 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-01-28 08:56:48 +0000 |
| commit | 262c956ed53b009a9bc6220eba21bc0bf6c968d1 (patch) | |
| tree | ec58c8707d2e885356ccb4d9027c81025dcfe779 /sys | |
| parent | 5806d07d3fd25ad6833cfa807dc25180a9468318 (diff) | |
| download | FreeBSD-src-262c956ed53b009a9bc6220eba21bc0bf6c968d1.zip FreeBSD-src-262c956ed53b009a9bc6220eba21bc0bf6c968d1.tar.gz | |
MFV r255258:
Diff reduction with upstream. The actual change was merged in r272483
already.
MFC after: 2 weeks
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c index e180850..a94404b 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2014 by Saso Kiselkov. All rights reserved. * Copyright 2014 Nexenta Systems, Inc. All rights reserved. |
