Revert accidental change to COPYING, move authors to master branch.

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644 (file)
index 04ebc20..0000000
--- a/AUTHORS
+++ /dev/null
@@ -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>

diff --git a/COPYING b/COPYING
index 50dcc09e32e7c344bdce4087842fffaffd819df2..90f44901b6fd5d0c2f11d124bd45a351e07b09c5 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -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.