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

Conflicts:
	WHENCE

diff --cc WHENCE
index a57bab5bfe7b1b7a581f16ce58e36ef90efe1c52,232da7cbd1536279d98bd72875355a7edfe8b4e6..a40e497de1b14c427fa74c97e5b704c689a41482
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -817,53 -799,41 +817,92 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
 +Driver: MYRI_SBUS - MyriCOM Gigabit Ethernet
 +
 +File: myricom/lanai.bin
 +
 +Licence: Unknown
 +
 +Found in hex form in kernel source.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: BNX2 - Broadcom NetXtremeII
 +
 +File: bnx2/bnx2-mips-06-4.6.16.fw
 +File: bnx2/bnx2-rv2p-06-4.6.16.fw
 +File: bnx2/bnx2-mips-09-4.6.17.fw
 +File: bnx2/bnx2-rv2p-09-4.6.15.fw
 +
 +Licence:
 +
 + This file contains firmware data derived from proprietary unpublished
 + source code, Copyright (c) 2004 - 2009 Broadcom Corporation.
 +
 + Permission is hereby granted for the distribution of this firmware data
 + in hexadecimal or equivalent format, provided this copyright notice is
 + accompanying it.
 +
 +Found in hex form in kernel source.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: DVB AV7110 -- AV7110 cards
 +
 +File: av7110/bootcode.bin
 +
 +Licence: GPLv2 or later
 +
 +ARM assembly source code available at http://www.linuxtv.org/downloads/firmware/Boot.S
 +
 +--------------------------------------------------------------------------
 +
 +Driver: wavefront - ISA WaveFront sound card
 +
 +File: yamaha/yss225_registers.bin
 +
 +Licence: Allegedly GPLv2+, but no source visible.
 +
 +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
+