From: David Woodhouse Date: Thu, 23 Jul 2009 16:14:50 +0000 (+0100) Subject: Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab... X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8620e8b6ad0366fbf2b505a9c094dde570f31fbb;p=linux-firmware Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware Conflicts: WHENCE --- 8620e8b6ad0366fbf2b505a9c094dde570f31fbb diff --cc WHENCE index 2a2c27c,c546a10..328d94a --- a/WHENCE +++ b/WHENCE @@@ -839,135 -600,10 +839,145 @@@ License -------------------------------------------------------------------------- +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 + +Licence: Unknown + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + +Driver: bnx2x: Broadcom Everest + +File: bnx2x-e1-4.8.53.0.fw +File: bnx2x-e1h-4.8.53.0.fw + +License: + Copyright (c) 2007-2009 Broadcom Corporation + + This file contains firmware data derived from proprietary unpublished + source code, Copyright (c) 2007-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: 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 + +-------------------------------------------------------------------------- + +Driver: rt61pci - Ralink RT2561, RT2561S, RT2661 wireless MACs + +File: rt2561.bin rt2561s.bin rt2661.bin + +Licence: Redistributable. See LICENSE.ralink-firmware.txt for details + +Downloaded from http://www.ralinktech.com/ralink/Home/Support/Linux.html + +-------------------------------------------------------------------------- + +Driver: rt73usb - Ralink RT2571W, RT2671 wireless MACs + +File: rt73.bin + +Licence: Redistributable. See LICENSE.ralink-firmware.txt for details + +Downloaded from http://www.ralinktech.com/ralink/Home/Support/Linux.html + +-------------------------------------------------------------------------- + +Driver: rt2860sta - Ralink RT2860, RT2890 wireless MACs + +File: rt2860.bin + +Licence: Redistributable. See LICENSE.ralink-firmware.txt for details + +Downloaded from http://www.ralinktech.com/ralink/Home/Support/Linux.html + +-------------------------------------------------------------------------- + +Driver: rt2870sta - Ralink RT2870 wireless MACs + +File: rt2870.bin + +Licence: Redistributable. See LICENSE.ralink-firmware.txt for details + +Downloaded from http://www.ralinktech.com/ralink/Home/Support/Linux.html + +-------------------------------------------------------------------------- + +Driver: usbdux/usbduxfast - usbdux data acquisition cards + +File: usbdux_firmware.bin +File: usbdixfast_firmware.bin +Source: usbdux/fx2-include.asm +Source: usbdux/usbduxfast_firmware.asm +Source: usbdux/usbdux_firmware.asm + +Licence: GPLv2. See source code in usbdux/ subdirectory. + +Provided from the author, Bernd Porr ++ ++-------------------------------------------------------------------------- ++ + Driver: xc5000 - Xceive 5000 Tuner driver + + File: dvb-fe-xc5000-1.6.114.fw + Info: v1.6.114 + + License: Redistributable. See LICENCE.xc5000 for details +