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

Conflicts:
	WHENCE

diff --git a/WHENCE b/WHENCE
index f519b83334865f054db764df9ea4d3c6cb37c3a6..a57bab5bfe7b1b7a581f16ce58e36ef90efe1c52 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -8,6 +8,24 @@ kernel.
 
 --------------------------------------------------------------------------
 
+Driver: ambassador -- Madge Ambassador (Collage PCI 155 Server) ATM NIC.
+
+File: firmware/atmsar11.fw
+
+Licence: Allegedly GPLv2+, but no source visible. Marked:
+
+  Madge Ambassador ATM Adapter microcode.
+  Copyright (C) 1995-1999  Madge Networks Ltd.
+
+  This microcode data is placed under the terms of the GNU General
+  Public License. The GPL is contained in /usr/doc/copyright/GPL on a
+  Debian system and in the file COPYING in the Linux kernel source.
+
+  We would prefer you not to distribute modified versions without
+  consultation and not to ask for assembly/other microcode source.
+
+--------------------------------------------------------------------------
+
 Driver: korg1212 -- Korg 1212 IO audio device
 
 File: korg/k1212.dsp
@@ -797,3 +815,55 @@ Licence: Unknown
 
 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
+
+Licence: GPLv2 or later
+
+ARM assembly source code available at http://www.linuxtv.org/downloads/firmware/Boot.S
+
+--------------------------------------------------------------------------
+
+Driver: wavefront - ISA WaveFront sound card
+
+File: yamaha/yss225_registers.bin
+
+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/av7110/bootcode.bin b/av7110/bootcode.bin
new file mode 100644 (file)
index 0000000..f315775
Binary files /dev/null and b/av7110/bootcode.bin differ

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

diff --git a/yamaha/yss225_registers.bin b/yamaha/yss225_registers.bin
new file mode 100644 (file)
index 0000000..99e9790
Binary files /dev/null and b/yamaha/yss225_registers.bin differ