Merge git://git.infradead.org/~dwmw2/firmware-2.6

* git://git.infradead.org/~dwmw2/firmware-2.6:
  qla1280: Fix off-by-some error in firmware loading.
  Add README.AddingFirmware file. Basically telling people not to.
  firmware: Remove newly-added slicoss and sxg firmware images
  firmware/WHENCE: Add missing origin information for Ambassador atmsar11.fw
  ALSA: wavefront - Always use request_firmware()
  Remove fdump tool for av7110 firmware
  firmware: convert av7110 driver to request_firmware()
  Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card"
  Revert "fix modules_install via NFS"

Add-add conflicts in firmware/WHENCE fixed manually

diff --git a/WHENCE b/WHENCE
index 929f9edb7a8165c9feb7bacbc14afc1f54daaa17..10f61c9e5a8aa15f98567420ed07e392ebb7f2c1 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -598,6 +598,36 @@ Found in hex form in kernel source.
 
 --------------------------------------------------------------------------
 
+Driver: MYRI_SBUS - MyriCOM Gigabit Ethernet
+
+File: myricom/lanai.bin
+
+Licence: Unknown
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------
+
+Driver: BNX2 - Broadcom NetXtremeII
+
+File: bnx2/bnx2-mips-06-4.6.16.fw
+File: bnx2/bnx2-rv2p-06-4.6.16.fw
+File: bnx2/bnx2-mips-09-4.6.17.fw
+File: bnx2/bnx2-rv2p-09-4.6.15.fw
+
+Licence:
+
+ This file contains firmware data derived from proprietary unpublished
+ source code, Copyright (c) 2004 - 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.
+
+--------------------------------------------------------------------------
+
 Driver: DVB AV7110 -- AV7110 cards
 
 File: av7110/bootcode.bin
@@ -617,5 +647,4 @@ Licence: Allegedly GPLv2+, but no source visible.
 Found in hex form in kernel source, with the following comment:
    Copyright (c) 1998-2002 by Paul Davis <pbd@op.net>
 
-
 --------------------------------------------------------------------------

diff --git a/bnx2/bnx2-mips-06-4.6.16.fw b/bnx2/bnx2-mips-06-4.6.16.fw
new file mode 100644 (file)
index 0000000..0ff4f5a
Binary files /dev/null and b/bnx2/bnx2-mips-06-4.6.16.fw differ

diff --git a/bnx2/bnx2-mips-09-4.6.17.fw b/bnx2/bnx2-mips-09-4.6.17.fw
new file mode 100644 (file)
index 0000000..2736b4a
Binary files /dev/null and b/bnx2/bnx2-mips-09-4.6.17.fw differ

diff --git a/bnx2/bnx2-rv2p-06-4.6.16.fw b/bnx2/bnx2-rv2p-06-4.6.16.fw
new file mode 100644 (file)
index 0000000..bea33c3
Binary files /dev/null and b/bnx2/bnx2-rv2p-06-4.6.16.fw differ

diff --git a/bnx2/bnx2-rv2p-09-4.6.15.fw b/bnx2/bnx2-rv2p-09-4.6.15.fw
new file mode 100644 (file)
index 0000000..bdb5d10
Binary files /dev/null and b/bnx2/bnx2-rv2p-09-4.6.15.fw differ

diff --git a/myricom/lanai.bin b/myricom/lanai.bin
new file mode 100644 (file)
index 0000000..ea09642
Binary files /dev/null and b/myricom/lanai.bin differ