Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk

This commit is contained in:
Brian Behlendorf 2010-05-18 14:47:33 -07:00
commit 948680b012
2 changed files with 2 additions and 6 deletions

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>

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.