Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2...

diff --combined WHENCE
index 877e1b3,524113f..3f56245
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -191,7 -191,7 +191,7 @@@ Original licence information: Non
  
  --------------------------------------------------------------------------
  
- Driver: tu_usb_3410_5052 -- USB TI 3410/5052 serial device
+ Driver: ti_usb_3410_5052 -- USB TI 3410/5052 serial device
  
  File: ti_3410.fw
  Info: firmware 9/10/04 FW3410_Special_StartWdogOnStartPort
@@@ -206,6 -206,20 +206,20 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
+ Driver: ti_usb_3410_5052 -- Multi-Tech USB cell modems
+ 
+ File: mts_cdma.fw
+ File: mts_gsm.fw
+ File: mts_edge.fw
+ 
+ Licence: "all firmware components are redistributable in binary form"
+          per support@multitech.com
+        Copyright (C) 2005 Multi-Tech Systems, Inc.
+ 
+ Found in hex form in ftp://ftp.multitech.com/wireless/wireless_linux.zip
+ 
+ --------------------------------------------------------------------------
+ 
  Driver: whiteheat -- USB ConnectTech WhiteHEAT serial device
  
  File: whiteheat.fw
@@@ -340,39 -354,6 +354,39 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
 +Driver: SCSI_QLA_FC - QLogic QLA2XXX Fibre Channel
 +
 +File: ql2100_fw.bin -- 1.19.38 TP
 +File: ql2200_fw.bin -- 2.02.08 TP
 +File: ql2300_fw.bin -- 3.03.20 IPX
 +File: ql2322_fw.bin -- 3.03.20 IPX
 +File: ql2400_fw.bin -- 4.04.04 IP
 +File: ql2500_fw.bin -- 4.04.04
 +
 +Licence: Redistributable. See LICENCE.qla2xxx for details
 +
 +Available from ftp://ftp.qlogic.com/outgoing/linux/firmware/
 +
 +--------------------------------------------------------------------------
 +
 +Driver: ORINOCO - Agere/Prism/Symbol Orinoco support
 +
 +File: agere_sta_fw.bin -- 9.48 Hermes I
 +File: agere_ap_fw.bin  -- 9.48 Hermes I
 +
 +Licence: Redistributable. See LICENCE.agere for details
 +
 +--------------------------------------------------------------------------
 +
 +Driver: AR9170 - Atheros 802.11n "otus" USB
 +
 +File: ar9170-1.fw
 +File: ar9170-2.fw
 +
 +License: Redistributable. See LICENCE.atheros_firmware for details
 +
 +--------------------------------------------------------------------------
 +
  Driver: CASSINI - Sun Cassini
  
  File: sun/cassini.bin
@@@ -454,13 -435,3 +468,13 @@@ Found in hex form in kernel source, wit
   ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM.
  
  --------------------------------------------------------------------------
 +
 +Driver: i2400m-usb - Intel 2400 Wireless WiMAX Connection over USb
 +
 +File: i2400m-fw-usb-1.3.sbcf
 +
 +License: Redistributable. See LICENCE.i2400m for details
 +
 +Also available from http://linuxwimax.org/Download
 +
 +--------------------------------------------------------------------------