Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-05-18 14:49:00 -07:00
parent 9a0ee546eb d07dde4627
commit e200246167
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -1,4 +0,0 @@
Brian Behlendorf <behlendorf1@llnl.gov>,
Herb Wartens <wartens2@llnl.gov>,
Jim Garlick <garlick@llnl.gov>,
Ricardo M. Correia <Ricardo.M.Correia@sun.com>

4
COPYING
View File

@ -1,2 +1,2 @@
The library is distributed under the terms of the CDDL.
See the file OPENSOLARIS.LICENSE for more information.
Please see COPYRIGHT and OPENSOLARIS.LICENSE for the copyright
and license details.