Merge branch 'master' of git://lunge.queued.net/git/linux-firmware

5 files changed, 50 insertions, 0 deletions

diff --git a/LICENCE.OLPC b/LICENCE.OLPC
new file mode 100644
index 00000000..a7409523
--- /dev/null
+++ b/LICENCE.OLPC
@@ -0,0 +1,33 @@
+Copyright (c) 2006, One Laptop per Child and Marvell Corporation.
+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.
diff --git a/WHENCE b/WHENCE
index e55cb66c..456de930 100644
--- a/WHENCE
+++ b/WHENCE
@@ -648,6 +648,23 @@ Linux driver tarballs downloaded from Marvell's "Extranet" with permission.
 
 --------------------------------------------------------------------------
 
+Driver: libertas - Marvell Libertas 802.11b/g cards, OLPC firmware
+
+File: libertas/lbtf_sdio.bin
+Info: v9.0.7.p4
+
+File: libertas/lbtf_usb.bin
+Info: v5.132.3.p1
+
+File: libertas/usb8388_olpc.bin
+Info: v5.110.22.p23
+
+Licence: Redistributable. See LICENCE.OLPC for details.
+
+Available from http://dev.laptop.org/pub/firmware/libertas/
+
+--------------------------------------------------------------------------
+
 Driver: mwl8k - Marvell Libertas softmac-type 802.11b/g cards
 
 File: mwl8k/fmimage_8687.fw
diff --git a/libertas/lbtf_sdio.bin b/libertas/lbtf_sdio.bin
new file mode 100644
index 00000000..a93d7651
--- /dev/null
+++ b/libertas/lbtf_sdio.bin
diff --git a/libertas/lbtf_usb.bin b/libertas/lbtf_usb.bin
new file mode 100644
index 00000000..8ee231a6
--- /dev/null
+++ b/libertas/lbtf_usb.bin
diff --git a/libertas/usb8388_olpc.bin b/libertas/usb8388_olpc.bin
new file mode 100644
index 00000000..e01b6c23
--- /dev/null
+++ b/libertas/usb8388_olpc.bin