Merge branch 'master' of http://git.decadent.org.uk/git/linux-firmware

Conflicts:
	WHENCE

diff --git a/LICENSE.ralink-firmware.txt b/LICENSE.ralink-firmware.txt
new file mode 100644 (file)
index 0000000..39e3c52
--- /dev/null
+++ b/LICENSE.ralink-firmware.txt
@@ -0,0 +1,39 @@
+Copyright (c) 2007, Ralink Technology Corporation \r
+All rights reserved.\r
+\r
+Redistribution.  Redistribution and use in binary form, without \r
+modification, are permitted provided that the following conditions are \r
+met:\r
+\r
+* Redistributions must reproduce the above copyright notice and the \r
+  following disclaimer in the documentation and/or other materials \r
+  provided with the distribution. \r
+* Neither the name of Ralink Technology Corporation nor the names of its\r
+  suppliers may be used to endorse or promote products derived from this\r
+  software without specific prior written permission. \r
+* No reverse engineering, decompilation, or disassembly of this software \r
+  is permitted.\r
+\r
+Limited patent license. Ralink Technology Corporation grants a world-wide, \r
+royalty-free, non-exclusive license under patents it now or hereafter \r
+owns or controls to make, have made, use, import, offer to sell and \r
+sell ("Utilize") this software, but solely to the extent that any \r
+such patent is necessary to Utilize the software alone, or in \r
+combination with an operating system licensed under an approved Open \r
+Source license as listed by the Open Source Initiative at \r
+http://opensource.org/licenses.  The patent license shall not apply to \r
+any other combinations which include this software.  No hardware per \r
+se is licensed hereunder.\r
+\r
+DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND \r
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, \r
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND \r
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE \r
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, \r
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, \r
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS \r
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND \r
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR \r
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE \r
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH \r
+DAMAGE.\r

diff --git a/WHENCE b/WHENCE
index a57bab5bfe7b1b7a581f16ce58e36ef90efe1c52..a40e497de1b14c427fa74c97e5b704c689a41482 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -867,3 +867,42 @@ Found in hex form in kernel source, with the following comment:
    Copyright (c) 1998-2002 by Paul Davis <pbd@op.net>
 
 --------------------------------------------------------------------------
+
+Driver: rt61pci - Ralink RT2561, RT2561S, RT2661 wireless MACs
+
+File: rt2561.bin rt2561s.bin rt2661.bin
+
+Licence: Redistributable. See LICENSE.ralink-firmware.txt for details
+
+Downloaded from http://www.ralinktech.com/ralink/Home/Support/Linux.html
+
+--------------------------------------------------------------------------
+
+Driver: rt73usb - Ralink RT2571W, RT2671 wireless MACs
+
+File: rt73.bin
+
+Licence: Redistributable. See LICENSE.ralink-firmware.txt for details
+
+Downloaded from http://www.ralinktech.com/ralink/Home/Support/Linux.html
+
+--------------------------------------------------------------------------
+
+Driver: rt2860sta - Ralink RT2860, RT2890 wireless MACs
+
+File: rt2860.bin
+
+Licence: Redistributable. See LICENSE.ralink-firmware.txt for details
+
+Downloaded from http://www.ralinktech.com/ralink/Home/Support/Linux.html
+
+--------------------------------------------------------------------------
+
+Driver: rt2870sta - Ralink RT2870 wireless MACs
+
+File: rt2870.bin
+
+Licence: Redistributable. See LICENSE.ralink-firmware.txt for details
+
+Downloaded from http://www.ralinktech.com/ralink/Home/Support/Linux.html
+

diff --git a/rt2561.bin b/rt2561.bin
new file mode 100644 (file)
index 0000000..b14bad3
Binary files /dev/null and b/rt2561.bin differ

diff --git a/rt2561s.bin b/rt2561s.bin
new file mode 100644 (file)
index 0000000..b0f7950
Binary files /dev/null and b/rt2561s.bin differ

diff --git a/rt2661.bin b/rt2661.bin
new file mode 100644 (file)
index 0000000..fe52a0b
Binary files /dev/null and b/rt2661.bin differ

diff --git a/rt2860.bin b/rt2860.bin
new file mode 100644 (file)
index 0000000..778a771
Binary files /dev/null and b/rt2860.bin differ

diff --git a/rt2870.bin b/rt2870.bin
new file mode 100644 (file)
index 0000000..9abc971
Binary files /dev/null and b/rt2870.bin differ

diff --git a/rt73.bin b/rt73.bin
new file mode 100644 (file)
index 0000000..1e395dd
Binary files /dev/null and b/rt73.bin differ