From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Apr 2009 19:01:22 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/firmware-2.6
X-Git-Tag: v2.6.30-rc2~88
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=1e17d774db837fe1a536066cbe971114405d2ba1

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
---

1e17d774db837fe1a536066cbe971114405d2ba1
diff --cc firmware/WHENCE
index e4deb51,929f9ed..10f61c9
--- a/firmware/WHENCE
+++ b/firmware/WHENCE
@@@ -633,32 -598,24 +598,53 @@@ 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>
+ 
 -
+ --------------------------------------------------------------------------