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

diff --cc WHENCE
index fee9042c7461a79f692e2e28abad31e050d73d0d,8b5651347791c4c69b180ec119a40d9f754571af..d0f4aa8f15f835ad61bc99f2d939b31a0d36f790
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -340,33 -340,84 +340,117 @@@ 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
+ 
+ Licence: Unknown
+ 
+ Found in hex form in kernel source.
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter
+ 
+ File: cxgb3/t3b_psram-1.1.0.bin.ihex
+ File: cxgb3/t3c_psram-1.1.0.bin.ihex
+ file: cxgb3/t3fw-7.0.0.bin.ihex
+ 
+ License: GPLv2 or OpenIB.org BSD license, no source visible
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: e100 -- Intel PRO/100 Ethernet NIC
+ 
+ File: e100/d101m_ucode.bin
+ File: e100/d101s_ucode.bin
+ File: e100/d102e_ucode.bin
+ 
+ Licence: Unknown
+ 
+ Found in hex form in kernel source.
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: acenic -- Alteon AceNIC Gigabit Ethernet card
+ 
+ File: acenic/tg1.bin
+ File: acenic/tg2.bin
+ 
+ Licence: Unknown
+ 
+ Found in hex form in kernel source, but source allegedly available at
+ http://alteon.shareable.org/
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: tigon3 -- Broadcom Tigon3 based gigabit Ethernet cards
+ 
+ File: tigon/tg3.bin
+ File: tigon/tg3_tso.bin
+ File: tigon/tg3_tso5.bin
+ 
+ Licence:
+  * Firmware is:
+  *    Derived from proprietary unpublished source code,
+  *    Copyright (C) 2000-2003 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: ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support
+ 
+ File: adaptec/starfire_rx.bin
+ File: adaptec/starfire_tx.bin
+ 
+ Licence: Allegedly GPLv2, but no source visible.
+ 
+ Found in hex form in kernel source, with the following notice:
+ 
+  BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE IT IS LICENSED "AS IS" AND
+  THERE IS NO WARRANTY FOR THE PROGRAM, INCLUDING BUT NOT LIMITED TO THE
+  IMPLIED WARRANTIES OF MERCHANTIBILITY OR FITNESS FOR A PARTICULAR PURPOSE
+  (TO THE EXTENT PERMITTED BY APPLICABLE LAW). USE OF THE PROGRAM IS AT YOUR
+  OWN RISK. IN NO EVENT WILL ADAPTEC OR ITS LICENSORS BE LIABLE TO YOU FOR
+  DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+  ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM.
+ 
+ --------------------------------------------------------------------------