[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.5.4-657-g58a6fe6

[Petter Reinholdtsen]

The following commit has been merged in the master branch:
commit 58a6fe6158ae797a9b9e3f4f60ad4c91ed41d7e4
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Feb 19 12:49:27 2016 +0100

    debian/copyright: Document BSD license for cmd/arc_summary/* and module/zfs/lz4.c.

diff --git a/debian/copyright b/debian/copyright
index df3be28..9c78c3f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,6 +30,13 @@ Files: *
 Copyright: Lawrence Livermore National Security, LLC.
 License: CDDL-1.0
 
+Files: cmd/arc_summary/*
+Copyright:
+  2010, 2011, Jason J. Hellenthal <jhell at DataIX.net>
+  2010, Martin Matuska <mm at FreeBSD.org>
+  2008, Ben Rockwood <benr at cuddletech.com>
+License: BSD-2-clause
+
 Files: cmd/mount_zfs/*
 Copyright: Oracle
  Lawrence Livermore National Security, LLC.
@@ -980,6 +987,10 @@ Files: module/zfs/lzjb.c
 Copyright: Oracle
 License: CDDL-1.0
 
+Files: module/zfs/lz4.c
+Copyright: 2011-2013, Yann Collet
+License: BSD-2-clause
+
 Files: module/zfs/metaslab.c
 Copyright: Oracle
  Delphix

-- 
OpenZFS on Linux