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

Conflicts:
	WHENCE

diff --combined WHENCE
index 9076356000d99b1a715adb1f9e99859e0fc61a88,0f5649a08c0c0d5b2802c10c94e769a4b34043be..b6f3c6d0fac87f86e0df8c1d7c46e1fba018502b
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -89,7 -89,6 +89,7 @@@ Licence: Allegedly GPLv2+, but no sourc
    Copyright (C) 2001 Qlogic Corporation (www.qlogic.com)
  
  --------------------------------------------------------------------------
 +
  Driver: smctr -- SMC ISA/MCA Token Ring adapter
  
  File: tr_smctr.bin
@@@ -399,39 -398,6 +399,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
@@@ -442,63 -408,11 +442,64 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
- File: slicoss/gbdownload.sys.ihex
- File: slicoss/gbrcvucode.sys.ihex
- File: slicoss/oasisdbgdownload.sys.ihex
- File: slicoss/oasisdownload.sys.ihex
- File: slicoss/oasisrcvucode.sys.ihex
 +Driver: SLICOSS - Alacritech IS-NIC products
 +
- File: sxg/saharadownloadB.sys.ihex
- File: sxg/saharadbgdownloadB.sys.ihex
++File: slicoss/gbdownload.sys
++File: slicoss/gbrcvucode.sys
++File: slicoss/oasisdbgdownload.sys
++File: slicoss/oasisdownload.sys
++File: slicoss/oasisrcvucode.sys
 +
 +Licence:
 +              Copyright (C) 1999-2009 Alacritech, Inc.
 +
 +      as an unpublished work. This notice does not imply unrestricted or
 +      public access to the source code from which this firmware image is
 +      derived.  Except as noted below this firmware image may not be
 +      reproduced, used, sold or transferred to any third party without
 +      Alacritech's prior written consent.  All Rights Reserved.
 +
 +      Permission is hereby granted for the distribution of this firmware
 +      image as part of a Linux or other Open Source operating system kernel
 +      in text or binary form as required.
 +
 +      This firmware may not be modified.
 +
 +Found in hex form in kernel source.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: SXG - Alacritech IS-NIC products
 +
++File: sxg/saharadownloadB.sys
++File: sxg/saharadbgdownloadB.sys
 +
 +Licence:
 +              Copyright (C) 1999-2009 Alacritech, Inc.
 +
 +      as an unpublished work. This notice does not imply unrestricted or
 +      public access to the source code from which this firmware image is
 +      derived.  Except as noted below this firmware image may not be
 +      reproduced, used, sold or transferred to any third party without
 +      Alacritech's prior written consent.  All Rights Reserved.
 +
 +      Permission is hereby granted for the distribution of this firmware
 +      image as part of a Linux or other Open Source operating system kernel
 +      in text or binary form as required.
 +
 +      This firmware may not be modified.
 +
 +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.4.0.bin.ihex
 +File: cxgb3/t3b_psram-1.1.0.bin
 +File: cxgb3/t3c_psram-1.1.0.bin
 +File: cxgb3/t3fw-7.0.0.bin
 +File: cxgb3/t3fw-7.1.0.bin
++file: cxgb3/t3fw-7.4.0.bin
  
  License: GPLv2 or OpenIB.org BSD license, no source visible
  
@@@ -566,92 -480,6 +567,92 @@@ Found in hex form in kernel source, wit
  
  --------------------------------------------------------------------------
  
 +Driver: i2400m-usb - Intel 2400 Wireless WiMAX Connection over USB
 +
 +File: i2400m-fw-usb-1.3.sbcf
 +File: i2400m-fw-usb-1.4.sbcf
 +
 +License: Redistributable. See LICENCE.i2400m for details
 +
 +Also available from http://linuxwimax.org/Download
 +
 +--------------------------------------------------------------------------
 +
 +Driver: libertas - Marvell Libertas fullmac-type 802.11b/g cards
 +
 +File: cf8385.bin
 +File: cf8385_helper.bin
 +File: gspi8682.bin
 +File: gspi8682_helper.bin
 +File: gspi8686_v9.bin
 +File: gspi8686_v9_helper.bin
 +File: gspi8688.bin
 +File: gspi8688_helper.bin
 +File: sd8385.bin
 +File: sd8385_helper.bin
 +File: sd8682.bin
 +File: sd8682_helper.bin
 +File: sd8686_v8.bin
 +File: sd8686_v8_helper.bin
 +File: sd8686_v9.bin
 +File: sd8686_v9_helper.bin
 +File: sd8688.bin
 +File: sd8688_helper.bin
 +File: usb8388_v5.bin
 +File: usb8388_v9.bin
 +File: usb8682.bin
 +
 +License: Redistributable. See libertas/LICENSE for details.  Extracted from
 +Linux driver tarballs downloaded from Marvell's "Extranet" with permission.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: mwl8k - Marvell Libertas softmac-type 802.11b/g cards
 +
 +File: fmimage_8687.fw
 +File: helper_8687.fw
 +
 +License: Redistributable. See mwl8k/LICENSE for details.  Downloaded from
 +Marvell's "Extranet" with permission.
 +
 +--------------------------------------------------------------------------
 +
 +
 +Driver: iwlwifi - Intel Wireless Wifi
 +
 +File: iwlwifi-3945-2.ucode
 +Info: v15.32.2.9
 +
 +File: iwlwifi-4965-2.ucode
 +Info: v228.57.2.23
 +
 +File: iwlwifi-5000-1.ucode
 +Info: v5.4.A.11 (aka v5.4.1.16)
 +
 +File: iwlwifi-5150-2.ucode
 +Info: v8.24.2.2
 +
 +License: Redistributable. See LICENCE.iwlwifi_firmware for details
 +
 +Also available from http://intellinuxwireless.org/?n=Downloads
 +
 +--------------------------------------------------------------------------
 +
 +Driver: cx231xx - Conexant Cx23100/101/102 USB broadcast A/V decoder
 +
 +File: v4l-cx231xx-avcore-01.fw
 +
 +License:
 +  Conexant grants permission to use and redistribute these firmware
 +  files for use with Conexant devices, but not as a part of the Linux
 +  kernel or in any other form which would require these files themselves
 +  to be covered by the terms of the GNU General Public License.
 +  These firmware files are distributed in the hope that they will be
 +  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
 +  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 +
 +--------------------------------------------------------------------------
 +
  Driver: TEHUTI - Tehuti Networks 10G Ethernet
  
  File: tehuti/bdx.bin
@@@ -748,6 -576,36 +749,36 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
+ Driver: PCMCIA_PCNET - NE2000 compatible PCMCIA adapter
+ 
+ File: cis/LA-PCM.cis
+ 
+ Licence: GPL
+ 
+ Originally developed by the pcmcia-cs project
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: PCMCIA_3C589 - 3Com PCMCIA adapter
+ 
+ File: cis/3CXEM556.cis
+ 
+ Licence: GPL
+ 
+ Originally developed by the pcmcia-cs project
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: PCMCIA_3C574 - 3Com PCMCIA adapter
+ 
+ File: cis/3CCFEM556.cis
+ 
+ Licence: GPL
+ 
+ Originally developed by the pcmcia-cs project
+ 
+ --------------------------------------------------------------------------
+ 
  Driver: PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA
  
  File: ositech/Xilinx7OD.bin
@@@ -760,54 -618,6 +791,54 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
 +Driver: cx23418 - Conexant PCI Broadcast A/V with MPEG encoder
 +
 +File: v4l-cx23418-apu.fw
 +File: v4l-cx23418-cpu.fw
 +File: v4l-cx23418-dig.fw
 +
 +License:
 +  Conexant grants permission to use and redistribute these firmware
 +  files for use with Conexant devices, but not as a part of the Linux
 +  kernel or in any other form which would require these files themselves
 +  to be covered by the terms of the GNU General Public License.
 +  These firmware files are distributed in the hope that they will be
 +  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
 +  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: cx23885 - Conexant PCI Express Broadcast A/V decoder
 +
 +File: v4l-cx23885-avcore-01.fw
 +File: v4l-cx23885-enc.fw
 +
 +License:
 +  Conexant grants permission to use and redistribute these firmware
 +  files for use with Conexant devices, but not as a part of the Linux
 +  kernel or in any other form which would require these files themselves
 +  to be covered by the terms of the GNU General Public License.
 +  These firmware files are distributed in the hope that they will be
 +  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
 +  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: cx23840 - Conexant sideport Broadcast A/V decoder
 +
 +File: v4l-cx25840.fw
 +
 +License:
 +  Conexant grants permission to use and redistribute these firmware
 +  files for use with Conexant devices, but not as a part of the Linux
 +  kernel or in any other form which would require these files themselves
 +  to be covered by the terms of the GNU General Public License.
 +  These firmware files are distributed in the hope that they will be
 +  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
 +  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 +
 +--------------------------------------------------------------------------
 +
  Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver
  
  File: qlogic/isp1000.bin
@@@ -824,6 -634,26 +855,26 @@@ File: myricom/lanai.bi
  
  Licence: Unknown
  
 -File: bnx2x-e1-4.8.53.0.fw.ihex
 -File: bnx2x-e1h-4.8.53.0.fw.ihex
+ Found in hex form in kernel source.
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: bnx2x: Broadcom Everest
+ 
++File: bnx2x-e1-4.8.53.0.fw
++File: bnx2x-e1h-4.8.53.0.fw
+ 
+ License:
+   Copyright (c) 2007-2009 Broadcom Corporation
+ 
+   This file contains firmware data derived from proprietary unpublished
+   source code, Copyright (c) 2007-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.
  
  --------------------------------------------------------------------------
@@@ -868,55 -698,3 +919,55 @@@ Found in hex form in kernel source, wit
     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
 +
 +--------------------------------------------------------------------------
 +
 +Driver: usbdux/usbduxfast - usbdux data acquisition cards
 +
 +File: usbdux_firmware.bin
 +File: usbdixfast_firmware.bin
 +Source: usbdux/fx2-include.asm
 +Source: usbdux/usbduxfast_firmware.asm
 +Source: usbdux/usbdux_firmware.asm
 +
 +Licence: GPLv2. See source code in usbdux/ subdirectory.
 +
 +Provided from the author, Bernd Porr <BerndPorr@f2s.com>