Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (74 commits)
  [SCSI] sg: fix q->queue_lock on scsi_error_handler path
  [SCSI] replace __inline with inline
  [SCSI] a2091: make 2 functions static
  [SCSI] a3000: make 2 functions static
  [SCSI] ses: #if 0 the unused ses_match_host()
  [SCSI] use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  [SCSI] sg: fix iovec bugs introduced by the block layer conversion
  [SCSI] qlogicpti: use request_firmware
  [SCSI] advansys: use request_firmware
  [SCSI] qla1280: use request_firmware
  [SCSI] libiscsi: fix iscsi pool error path
  [SCSI] cxgb3i: call ddp release function directly
  [SCSI] cxgb3i: merge cxgb3i_ddp into cxgb3i module
  [SCSI] cxgb3i: close all tcp connections upon chip reset
  [SCSI] cxgb3i: re-read ddp settings information after chip reset
  [SCSI] cxgb3i: re-initialize ddp settings after chip reset
  [SCSI] cxgb3i: subscribe to error notification from cxgb3 driver
  [SCSI] aacraid driver update
  [SCSI] mptsas: remove unneeded check
  [SCSI] config: Make need for SCSI_CDROM clearer
  ...

diff --git a/WHENCE b/WHENCE
index 441929fed89b047cc4f17cef034c5e94a1cee00a..c006af85a1aaea1086c9b722ae913f45e9a4d07f 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -390,6 +390,59 @@ 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

diff --git a/slicoss/gbdownload.sys b/slicoss/gbdownload.sys
new file mode 100644 (file)
index 0000000..60ab75b
Binary files /dev/null and b/slicoss/gbdownload.sys differ

diff --git a/slicoss/gbrcvucode.sys b/slicoss/gbrcvucode.sys
new file mode 100644 (file)
index 0000000..855b23e
Binary files /dev/null and b/slicoss/gbrcvucode.sys differ

diff --git a/slicoss/oasisdbgdownload.sys b/slicoss/oasisdbgdownload.sys
new file mode 100644 (file)
index 0000000..4ae5023
Binary files /dev/null and b/slicoss/oasisdbgdownload.sys differ

diff --git a/slicoss/oasisdownload.sys b/slicoss/oasisdownload.sys
new file mode 100644 (file)
index 0000000..cdc2cc1
Binary files /dev/null and b/slicoss/oasisdownload.sys differ

diff --git a/slicoss/oasisrcvucode.sys b/slicoss/oasisrcvucode.sys
new file mode 100644 (file)
index 0000000..a2b9bde
Binary files /dev/null and b/slicoss/oasisrcvucode.sys differ

diff --git a/sxg/saharadbgdownloadB.sys b/sxg/saharadbgdownloadB.sys
new file mode 100644 (file)
index 0000000..d3b3ed1
Binary files /dev/null and b/sxg/saharadbgdownloadB.sys differ

diff --git a/sxg/saharadownloadB.sys b/sxg/saharadownloadB.sys
new file mode 100644 (file)
index 0000000..c48cb92
Binary files /dev/null and b/sxg/saharadownloadB.sys differ