Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  b44: Use kernel DMA addresses for the kernel DMA API
  forcedeth: Fix resume from hibernation regression.
  xfrm: fix fragmentation on inter family tunnels
  ibm_newemac: Fix dangerous struct assumption
  gigaset: documentation update
  gigaset: in file ops, check for device disconnect before anything else
  bas_gigaset: use tasklet_hi_schedule for timing critical tasklets
  net/802/fddi.c: add MODULE_LICENSE
  smsc911x: remove unused #include <linux/version.h>
  axnet_cs: fix phy_id detection for bogus Asix chip.
  bnx2: Use request_firmware()
  b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}()
  socket: use percpu_add() while updating sockets_in_use
  virtio_net: Set the mac config only when VIRITO_NET_F_MAC
  myri_sbus: use request_firmware
  e1000: fix loss of multicast packets
  vxge: should include tcp.h

Conflict in firmware/WHENCE (SCSI vs net firmware)

diff --git a/WHENCE b/WHENCE
index f3d015115034b28d096e931a90acdc4e6b6a31f1..e4deb511cc73766537f5a992845f1cf0d5427239 100644 (file)
--- 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
@@ -364,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
@@ -544,6 +623,16 @@ 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.
+
+--------------------------------------------------------------------------
+
 Driver: MYRI_SBUS - MyriCOM Gigabit Ethernet
 
 File: myricom/lanai.bin

diff --git a/advansys/3550.bin b/advansys/3550.bin
new file mode 100644 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
index 0000000..1f4c3c6
Binary files /dev/null and b/qlogic/isp1000.bin differ

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