From: David Woodhouse Date: Wed, 6 Jan 2010 16:18:34 +0000 (+0000) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/linux... X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=c103430a955a286e459a658d6300557fb1d72ad4;p=linux-firmware Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/linux-firmware-from-kernel Conflicts: WHENCE --- c103430a955a286e459a658d6300557fb1d72ad4 diff --cc WHENCE index bee93c3,34b5d0a..0b99cb1 --- a/WHENCE +++ b/WHENCE @@@ -867,10 -678,10 +905,12 @@@ 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 + File: bnx2x-e1-5.2.7.0.fw.ihex + File: bnx2x-e1h-5.2.7.0.fw.ihex -License: +Licence: Copyright (c) 2007-2009 Broadcom Corporation This file contains firmware data derived from proprietary unpublished @@@ -888,9 -699,9 +928,14 @@@ 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-06-5.0.0.j3.fw File: bnx2/bnx2-mips-09-4.6.17.fw ++File: bnx2/bnx2-mips-09-5.0.0.j3.fw ++File: bnx2/bnx2-rv2p-06-4.6.16.fw ++File: bnx2/bnx2-rv2p-06-5.0.0.j3.fw File: bnx2/bnx2-rv2p-09-4.6.15.fw ++File: bnx2/bnx2-rv2p-09-5.0.0.j3.fw ++File: bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw Licence: @@@ -926,80 -737,123 +971,205 @@@ Found in hex form in kernel source, wit -------------------------------------------------------------------------- +Driver: rt61pci - Ralink RT2561, RT2561S, RT2661 wireless MACs + +File: rt2561.bin rt2561s.bin rt2661.bin + +Licence: Redistributable. See LICENCE.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 LICENCE.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 LICENCE.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 LICENCE.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 + +Licence: Redistributable. See LICENCE.xc5000 for details + +-------------------------------------------------------------------------- + +Driver: dib0700 - DiBcom dib0700 USB DVB bridge driver + +File: dvb-usb-dib0700-1.20.fw +Info: v1.20 + +Licence: Redistributable. See LICENCE.dib0700 for details ++ +-------------------------------------------------------------------------- + +Driver: DFU Driver for Atheros bluetooth chipset AR3011 + +File: ath3k-1.fw +Info: v1.0 + +Licence: Redistributable. See LICENCE.atheros_firmware for details ++ ++-------------------------------------------------------------------------- ++ + Driver: mga - Matrox G200/G400/G550 + + File: matrox/g200_warp.fw + File: matrox/g400_warp.fw + + Licence: + + Copyright 1999 Matrox Graphics Inc. + All Rights Reserved. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + MATROX GRAPHICS INC., OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE + OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Found in hex form in kernel source. + + -------------------------------------------------------------------------- + + Driver: r128 - ATI Rage 128 + + File: r128/r128_cce.bin + + Licence: + + Copyright 2000 Advanced Micro Devices, Inc. + + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + + Found in decimal form in kernel source. + + -------------------------------------------------------------------------- + + Driver: radeon - ATI Radeon + + File: radeon/R100_cp.bin + File: radeon/R200_cp.bin + File: radeon/R300_cp.bin + File: radeon/R420_cp.bin + File: radeon/RS600_cp.bin + File: radeon/RS690_cp.bin + File: radeon/R520_cp.bin + File: radeon/R600_pfp.bin + File: radeon/R600_me.bin + File: radeon/RV610_pfp.bin + File: radeon/RV610_me.bin + File: radeon/RV630_pfp.bin + File: radeon/RV630_me.bin + File: radeon/RV620_pfp.bin + File: radeon/RV620_me.bin + File: radeon/RV635_pfp.bin + File: radeon/RV635_me.bin + File: radeon/RV670_pfp.bin + File: radeon/RV670_me.bin + File: radeon/RS780_pfp.bin + File: radeon/RS780_me.bin + File: radeon/RV770_pfp.bin + File: radeon/RV770_me.bin + File: radeon/RV730_pfp.bin + File: radeon/RV730_me.bin + File: radeon/RV710_pfp.bin + File: radeon/RV710_me.bin + + Licence: + + * Copyright 2007-2009 Advanced Micro Devices, Inc. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Found in hex form in kernel source. + + -------------------------------------------------------------------------- ++