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

Conflicts:
	WHENCE

8 files changed, 78 insertions, 0 deletions

diff --git a/LICENSE.ralink-firmware.txt b/LICENSE.ralink-firmware.txt
new file mode 100644
index 00000000..39e3c521
--- /dev/null
+++ b/LICENSE.ralink-firmware.txt
@@ -0,0 +1,39 @@
+Copyright (c) 2007, Ralink Technology 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 Ralink Technology 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.

+

+Limited patent license. Ralink Technology Corporation 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.

diff --git a/WHENCE b/WHENCE
index a57bab5b..a40e497d 100644
--- 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
index 00000000..b14bad3f
--- /dev/null
+++ b/rt2561.bin
diff --git a/rt2561s.bin b/rt2561s.bin
new file mode 100644
index 00000000..b0f79505
--- /dev/null
+++ b/rt2561s.bin
diff --git a/rt2661.bin b/rt2661.bin
new file mode 100644
index 00000000..fe52a0b1
--- /dev/null
+++ b/rt2661.bin
diff --git a/rt2860.bin b/rt2860.bin
new file mode 100644
index 00000000..778a7717
--- /dev/null
+++ b/rt2860.bin
diff --git a/rt2870.bin b/rt2870.bin
new file mode 100644
index 00000000..9abc971b
--- /dev/null
+++ b/rt2870.bin
diff --git a/rt73.bin b/rt73.bin
new file mode 100644
index 00000000..1e395dd6
--- /dev/null
+++ b/rt73.bin