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

Conflicts:
	WHENCE

diff --cc WHENCE
index 20c1b7e,c006af8..f519b83
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -45,6 -45,32 +45,33 @@@ Found alsa-firmware package in hex form
  
  --------------------------------------------------------------------------
  
+ Driver: SCSI_ADVANSYS - AdvanSys SCSI
+ 
+ File: advansys/mcode.bin
+ File: advansys/3550.bin
+ File: advansys/38C0800.bin
+ File: advansys/38C1600.bin
+ 
+ Licence: BSD, no source available.
+ 
+ Found in hex form in kernel source.
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI support
+ 
+ File: qlogic/1040.bin
+ File: qlogic/1280.bin
+ File: qlogic/12160.bin
+ 
+ Licence: Allegedly GPLv2+, but no source visible. Marked:
+ 
+                    QLOGIC LINUX SOFTWARE
+   QLogic ISP1280/ device driver for Linux 2.2.x and 2.4.x
+   Copyright (C) 2001 Qlogic Corporation (www.qlogic.com)
+ 
+ --------------------------------------------------------------------------
++
  Driver: smctr -- SMC ISA/MCA Token Ring adapter
  
  File: tr_smctr.bin
@@@ -397,12 -390,64 +424,65 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
+ Driver: SLICOSS - Alacritech IS-NIC products
+ 
+ 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
+ 
+ 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 and may only be used with
+       Alacritech hardware.
+ 
+ Found in hex form in kernel source.
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: SXG - Alacritech IS-NIC products
+ 
+ File: sxg/saharadownloadB.sys.ihex
+ File: sxg/saharadbgdownloadB.sys.ihex
+ 
+ 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 and may only be used with
+       Alacritech hardware.
+ 
+ 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.1.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
  
  License: GPLv2 or OpenIB.org BSD license, no source visible
  
@@@ -661,50 -623,12 +741,59 @@@ 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
+ 
+ Licence: Unknown
+ 
+ Found in hex form in kernel source.
+