[kernel] r18064 - dists/trunk/firmware-nonfree/libertas

Fri Sep 9 01:18:26 UTC 2011

Author: benh
Date: Fri Sep  9 01:18:24 2011
New Revision: 18064

Log:
Add licence for Libertas firmware for OLPC; use DEP-5 format

Modified:
   dists/trunk/firmware-nonfree/libertas/LICENSE

Modified: dists/trunk/firmware-nonfree/libertas/LICENSE
==============================================================================

--- dists/trunk/firmware-nonfree/libertas/LICENSE	Thu Sep  8 14:48:59 2011	(r18063)
+++ dists/trunk/firmware-nonfree/libertas/LICENSE	Fri Sep  9 01:18:24 2011	(r18064)
@@ -1,42 +1,79 @@
-Copyright (c) Marvell International Ltd.
-
-All rights reserved.
-
-Redistribution. Redistribution and use in binary form, without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions must reproduce the above copyright notice and the
-  following disclaimer in the documentation and/or other materials
-  provided with the distribution.
-
-* Neither the name of Marvell International Ltd. nor the names of its
-  suppliers may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-* No reverse engineering, decompilation, or disassembly of this
-  software is permitted.
-
-Limited patent license. Marvell International Ltd. grants a
-world-wide, royalty-free, non-exclusive license under patents it now
-or hereafter owns or controls to make, have made, use, import, offer
-to sell and sell ("Utilize") this software, but solely to the extent
-that any such patent is necessary to Utilize the software alone, or in
-combination with an operating system licensed under an approved Open
-Source license as listed by the Open Source Initiative at
-http://opensource.org/licenses. The patent license shall not apply to
-any other combinations which include this software. No hardware per se
-is licensed hereunder.
-
-DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+Files: libertas/libertas/*, libertas/mwl8k/*
+Copyright: Marvell International Ltd.
+License: Binary redistribution (Marvell 1)
+ All rights reserved.
+ .
+ Redistribution. Redistribution and use in binary form, without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions must reproduce the above copyright notice and the
+   following disclaimer in the documentation and/or other materials
+   provided with the distribution.
+ .
+ * Neither the name of Marvell International Ltd. nor the names of its
+   suppliers may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+ .
+ * No reverse engineering, decompilation, or disassembly of this
+   software is permitted.
+ .
+ Limited patent license. Marvell International Ltd. grants a
+ world-wide, royalty-free, non-exclusive license under patents it now
+ or hereafter owns or controls to make, have made, use, import, offer
+ to sell and sell ("Utilize") this software, but solely to the extent
+ that any such patent is necessary to Utilize the software alone, or in
+ combination with an operating system licensed under an approved Open
+ Source license as listed by the Open Source Initiative at
+ http://opensource.org/licenses. The patent license shall not apply to
+ any other combinations which include this software. No hardware per se
+ is licensed hereunder.
+ .
+ DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+
+Files: libertas/lbtf_usb.bin, libertas/libertas/usb8388_olpc.bin
+Copyright: 2006, One Laptop per Child and Marvell Corporation.
+License: Binary redistribution (Marvell 2)
+ All rights reserved.
+ .
+ Redistribution.  Redistribution and use in binary form, without 
+ modification, are permitted provided that the following conditions are 
+ met:
+ .
+ * Redistributions must reproduce the above copyright notice and the 
+   following disclaimer in the documentation and/or other materials 
+   provided with the distribution.
+ * Neither the name of Marvell Corporation nor the names of its suppliers 
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission.
+ * No reverse engineering, decompilation, or disassembly of this software 
+   is permitted.
+ * You may not use or attempt to use this software in conjunction with
+   any product that is offered by a third party as a replacement,
+   substitute or alternative to a Marvell Product where a Marvell Product
+   is defined as a proprietary wireless LAN embedded client solution of
+   Marvell or a Marvell Affiliate.
+ .
+ DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+ CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
+ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
+ DAMAGE.

