From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sat, 8 Jan 2011 22:01:05 +0000 (+0000)
Subject: Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/bwh/linux-firmware
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3ba83bfdc98d3270d20b5a4df8bafce3c0ec685;hp=-c;p=linux-firmware

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/bwh/linux-firmware

Conflicts:
	WHENCE
---

c3ba83bfdc98d3270d20b5a4df8bafce3c0ec685
diff --combined WHENCE
index 92b1a41,780ebb0..0bc162c
--- a/WHENCE
+++ b/WHENCE
@@@ -671,15 -671,6 +671,15 @@@ Info: v9.193.4.
  File: iwlwifi-6050-4.ucode
  Info: v9.201.4.1
  
 +File: iwlwifi-6050-5.ucode
 +Info: v41.28.5.1
 +
 +File: iwlwifi-6000g2a-5.ucode
 +Info: v17.168.5.1
 +
 +File: iwlwifi-6000g2b-5.ucode
 +Info: v17.168.5.1
 +
  Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
  
  Also available from http://intellinuxwireless.org/?n=Downloads
@@@ -994,7 -985,7 +994,7 @@@ Found in hex form in kernel source
  Driver: netxen_nic - NetXen Multi port (1/10) Gigabit Ethernet NIC
  
  File: phanfw.bin
 -Info: v4.0.517
 +Info: v4.0.534
  
  Licence: Redistributable. See LICENCE.phanfw for details.
  
@@@ -1110,8 -1101,6 +1110,8 @@@ Driver: ath3k - DFU Driver for Atheros 
  File: ath3k-1.fw
  Info: v1.0
  
 +Fix EEPROM radio table issue and change PID to 3005
 +
  Licence: Redistributable. See LICENCE.atheros_firmware for details
  
  --------------------------------------------------------------------------
@@@ -1253,9 -1242,6 +1253,9 @@@ File: radeon/JUNIPER_rlc.bi
  File: radeon/REDWOOD_me.bin
  File: radeon/REDWOOD_pfp.bin
  File: radeon/REDWOOD_rlc.bin
 +File: radeon/PALM_me.bin
 +File: radeon/PALM_pfp.bin
 +File: radeon/SUMO_rlc.bin
  
  Licence: Redistributable. See LICENSE.radeon_rlc for details.
  
@@@ -1388,7 -1374,6 +1388,7 @@@ Driver: vxge - Exar X3100 Series 10GbE 
  
  File: vxge/X3fw.ncf
  File: vxge/X3fw-pxe.ncf
 +Version: 1.8.1
  
  Licence:
  
@@@ -1419,76 -1404,8 +1419,81 @@@ Licence: Redistributable. See LICENCE.b
  
  --------------------------------------------------------------------------
  
 +Driver: wl12xx - Texas Instruments 802.11 wireless LAN driver
 +
 +File: wl1271-fw.bin
 +File: wl1271-nvs.bin
 +File: wl1271-fw-ap.bin
 +File: wl1271-nvs-ap.bin
 +
 +Licence: See LICENCE.ti-connectivity for details.
 +
 +	Station:      wl1271-fw.bin version 6.1.0.0.343 (RM version 206)
 +	Access Point: wl1271-fw-ap.bin version 6.2.0.0.30 (RM version 6.2.0.0.6)
 +	The nvs file includes two parts:
 +	 - radio calibration
 +	 - ini setting parameters
 +
 +	In order to use that files copy them to target FS at /lib/firmware/.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: tlg2300 - Telgent 2300 V4L/DVB driver.
 +
 +File: tlg2300_firmware.bin
 +
 +Licence:
 +  Telegent System grants permission to use and redistribute these
 +  firmware files for use with devices containing the chip tlg2300, but
 +  not as a part of the Linux kernel or in any other form which would
 +  require these files themselves to be covered by the terms of the GNU
 +  General Public License. These firmware files are distributed in the
 +  hope that they will be useful, but WITHOUT ANY WARRANTY; without even
 +  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 +  PURPOSE.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: r8712u - Reaktek 802.11n WLAN driver for RTL8712U
 +
 +File: rtlwifi/rtl8712u.bin
 +
 +Licence: Redistributable. See LICENCE.rtlwifi_firmware for details.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: rtl8192ce - Reaktek 802.11n WLAN driver for RTL8192CE
 +
 +File: rtlwifi/rtl8192cfw.bin
 +
 +Licence: Redistributable. See LICENCE.rtlwifi_firmware for details.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: rtl8192cu - Realtek 802.11n WLAN driver for RTL8192CU
 +
 +File: rtlwifi/rtl8192cufw.bin
 +
 +Licence: Redistributable. See LICENCE.rtlwifi_firmware for details.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: r8169 - RealTek 8169/8168/8101 ethernet driver.
 +
 +File: rtl_nic/rtl8168d-1.fw
 +File: rtl_nic/rtl8168d-2.fw
 +
 +Licence:
 + * Copyright (c) 2010, Realtek Semiconductor Corporation 
 + *
 + * Permission is hereby granted for the distribution of this firmware
 + * data in hexadecimal or equivalent format, provided this copyright
 + * notice is accompanying it.
 +
 +--------------------------------------------------------------------------
 +
+ Driver: vt6656 - VIA VT6656 USB wireless driver
+ 
+ File: vntwusb.fw
+ 
+ Licence: Redistributable. See LICENCE.via_vt6656 for details.