From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Apr 2009 20:24:49 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fdb1d5096dc48f326bf130e453bdd6497e7cab4;hp=358e907754cc7a06f891ea989eafa8ea790514f8;p=linux-firmware

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 d6c227d..c006af8 100644
--- a/WHENCE
+++ b/WHENCE
@@ -45,6 +45,32 @@ Found alsa-firmware package in hex form, with the following comment:
 
 --------------------------------------------------------------------------
 
+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
@@ -596,3 +622,13 @@ Licence: Allegedly GPL, but no source visible. Marked:
 Found in hex form in kernel source.
 
 --------------------------------------------------------------------------
+
+Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver
+
+File: qlogic/isp1000.bin
+
+Licence: Unknown
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------
diff --git a/advansys/3550.bin b/advansys/3550.bin
new file mode 100644
index 0000000..5a4581c
Binary files /dev/null and b/advansys/3550.bin differ
diff --git a/advansys/38C0800.bin b/advansys/38C0800.bin
new file mode 100644
index 0000000..2b222cd
Binary files /dev/null and b/advansys/38C0800.bin differ
diff --git a/advansys/38C1600.bin b/advansys/38C1600.bin
new file mode 100644
index 0000000..db568df
Binary files /dev/null and b/advansys/38C1600.bin differ
diff --git a/advansys/mcode.bin b/advansys/mcode.bin
new file mode 100644
index 0000000..c126509
Binary files /dev/null and b/advansys/mcode.bin differ
diff --git a/qlogic/1040.bin b/qlogic/1040.bin
new file mode 100644
index 0000000..01366ea
Binary files /dev/null and b/qlogic/1040.bin differ
diff --git a/qlogic/12160.bin b/qlogic/12160.bin
new file mode 100644
index 0000000..7f7f255
Binary files /dev/null and b/qlogic/12160.bin differ
diff --git a/qlogic/1280.bin b/qlogic/1280.bin
new file mode 100644
index 0000000..62d2994
Binary files /dev/null and b/qlogic/1280.bin differ
diff --git a/qlogic/isp1000.bin b/qlogic/isp1000.bin
new file mode 100644
index 0000000..1f4c3c6
Binary files /dev/null and b/qlogic/isp1000.bin differ