Merge git://git.chelsio.net/pub/git/linux-firmware

diff --combined WHENCE
index 0237ef1c379cb1ba3e283c38df60053ac90db9c0,3655d23d507a2cd3c3f86fc7d74836fc3c86b252..60c189c87abd3d06c9bb5cd79ede8a8fea201f78
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -436,8 -436,6 +436,8 @@@ Driver: ath9k_htc - Atheros HTC device
  File: ar9271.fw
  File: ar7010.fw
  File: ar7010_1_1.fw
 +File: htc_9271.fw
 +File: htc_7010.fw
  
  Licence: Redistributable. See LICENCE.atheros_firmware for details
  
@@@ -532,6 -530,14 +532,14 @@@ Licence
  Found in hex form in kernel source.
  
  --------------------------------------------------------------------------
+ 
+ Driver: cxgb4 - Chelsio Terminator 4 1G/10G Ethernet adapter
+ 
+ File: cxgb4/t4fw.bin
+ 
+ Licence: Redistributable. See LICENCE.chelsio_firmware for details
+ 
+ --------------------------------------------------------------------------
  
  Driver: e100 -- Intel PRO/100 Ethernet NIC
  
@@@ -642,7 -648,6 +650,7 @@@ File: mwl8k/fmimage_8687.f
  File: mwl8k/helper_8687.fw
  File: mwl8k/fmimage_8366.fw
  File: mwl8k/fmimage_8366_ap-1.fw
 +File: mwl8k/fmimage_8366_ap-2.fw
  File: mwl8k/helper_8366.fw
  
  Licence: Redistributable. See LICENCE.Marvell for details.  8687 images
@@@ -1024,7 -1029,7 +1032,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.534
 +Info: v4.0.550
  
  Licence: Redistributable. See LICENCE.phanfw for details.
  
@@@ -1071,13 -1076,13 +1079,13 @@@ Downloaded from http://www.ralinktech.c
  
  --------------------------------------------------------------------------
  
 -Driver: rt2860sta - Ralink RT2860, RT2890 wireless MACs
 +Driver: rt2800pci - Ralink RT2860, RT2890, RT3090, RT5390 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
 +Binary file supplied by Shiang Tu <shiang_tu@ralinktech.com>. Firmware Version 34
  
  --------------------------------------------------------------------------
  
@@@ -1091,7 -1096,7 +1099,7 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
 -Driver: rt2870sta - Ralink RT2870, RT3070, RT3071, RT3072 wireless MACs
 +Driver: rt2800usb - Ralink RT2870, RT3070, RT3071, RT3072, RT5370 wireless MACs
  
  File: rt2870.bin
  File: rt3070.bin
@@@ -1099,7 -1104,7 +1107,7 @@@ File: rt3071.bi
  
  Licence: Redistributable. See LICENCE.ralink-firmware.txt for details
  
 -Found in hex form in kernel source.
 +Binary file supplied by Shiang Tu <shiang_tu@ralinktech.com>. Firmware Version 29
  
  --------------------------------------------------------------------------
  
@@@ -1436,76 -1441,42 +1444,76 @@@ Licence
  
  --------------------------------------------------------------------------
  
 -Driver: brcm80211 - Broadcom 802.11n wireless LAN driver.
 +Driver: brcmsmac - Broadcom 802.11n softmac wireless LAN driver.
  
 -File: brcm/bcm43xx-0-610-809-0.fw
 -File: brcm/bcm43xx_hdr-0-610-809-0.fw
 +File: brcm/bcm43xx-0.fw
 +File: brcm/bcm43xx_hdr-0.fw
  
  Licence: Redistributable. See LICENCE.broadcom_bcm43xx for details.
  
  --------------------------------------------------------------------------
  
 -Driver: brcm80211 - Broadcom 802.11n wireless LAN driver.
 +Driver: brcmfmac - Broadcom 802.11n fullmac wireless LAN driver.
  
 -File: bcm4329-fullmac-4-218-248-5.bin
 -File: bcm4329-fullmac-4-218-248-5.txt
 +File: brcm/bcm4329-fullmac-4.bin
 +File: brcm/bcm4329-fullmac-4.txt
  
  Licence: Redistributable. See LICENCE.broadcom_bcm43xx for details.
  
  --------------------------------------------------------------------------
  
 +Driver: tda7706 - FM radio Highly integrated tuner for AM/FM car-radio
 +
 +File: TDA7706_OM_v2.5.1_boot.txt
 +File: TDA7706_OM_v3.0.2_boot.txt
 +
 +Licence: Redistributable. See LICENCE.tda7706-firmware.txt for details.
 +        Copyright © 2010 STMicroelectronics
 +
 +--------------------------------------------------------------------------
 +
  Driver: wl12xx - Texas Instruments 802.11 wireless LAN driver
  
  File: wl1271-fw.bin
  File: wl1271-fw-2.bin
 +File: wl128x-fw.bin
  File: wl1271-fw-ap.bin
 -File: wl1271-nvs.bin
 +File: wl128x-fw-ap.bin
 +File: wl1271-nvs-example-wl127x.bin
 +File: wl1271-nvs-example-wl128x.bin
  
  Licence: See LICENCE.ti-connectivity for details.
  
 -      Station:      wl1271-fw.bin version 6.1.0.50.350 (RM version 206)
 -      Station:      wl1271-fw-2.bin version 6.1.3.50.55
 -      Access Point: wl1271-fw-ap.bin version 6.2.0.0.36
 +      Station:      wl1271-fw.bin version 6.1.0.50.350
 +      Station:      wl1271-fw-2.bin version 6.1.3.50.58
 +      Station:      wl128x-fw.bin version 7.1.3.50.58
 +      Access Point: wl1271-fw-ap.bin version 6.2.0.0.47
 +      Access Point: wl128x-fw-ap.bin version 7.2.0.0.47
  
 -      The nvs file includes two parts:
 +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/.
 +In order to have correct NVS file for your device NVS tool should be use:
 +http://linuxwireless.org/en/users/Drivers/wl12xx/calibrator
 +
 +Example NVS files (not optimal) for wl127x and wl128x includes.
 +To use example NVS rename one of them to wl1271-nvs.bin
 +
 +In order to use that files copy ti-connectivity directory to target FS at
 +/lib/firmware/.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: TI_ST - Texas Instruments bluetooth driver
 +
 +File: TIInit_7.2.31.bts
 +
 +Licence: See LICENCE.ti-connectivity for details.
 +
 +      TIInit_7.2.31.bts version 7.2.31
 +
 +      In order to use that file copy it to /lib/firmware/ti-connectivity.
  
  --------------------------------------------------------------------------
  
@@@ -1570,12 -1541,9 +1578,12 @@@ Driver: r8169 - RealTek 8169/8168/8101 
  
  File: rtl_nic/rtl8168d-1.fw
  File: rtl_nic/rtl8168d-2.fw
 +File: rtl_nic/rtl8105e-1.fw
 +File: rtl_nic/rtl8168e-1.fw
 +File: rtl_nic/rtl8168e-2.fw
  
  Licence:
 - * Copyright (c) 2010, Realtek Semiconductor Corporation 
 + * Copyright © 2011, Realtek Semiconductor Corporation
   *
   * Permission is hereby granted for the distribution of this firmware
   * data in hexadecimal or equivalent format, provided this copyright
@@@ -1595,9 -1563,6 +1603,9 @@@ Driver: DFU Driver for Atheros bluetoot
  
  File: ar3k/AthrBT_0x01020001.dfu
  File: ar3k/ramps_0x01020001_26.dfu
 +File: ar3k/AthrBT_0x01020200.dfu
 +File: ar3k/ramps_0x01020200_26.dfu
 +File: ar3k/ramps_0x01020200_40.dfu
  
  Licence: Redistributable. See LICENCE.atheros_firmware for details
  
@@@ -1616,53 -1581,3 +1624,53 @@@ File: ar3k/30000/PS_ASIC.ps
  File: ar3k/30000/RamPatch.txt
  
  Licence: Redistributable. See LICENCE.atheros_firmware for details
 +
 +--------------------------------------------------------------------------
 +
 +Driver: ath6kl - Atheros support for AR6003
 +
 +File: ath6k/
 +File: ath6k/AR6003
 +File: ath6k/AR6003/hw1.0
 +File: ath6k/AR6003/hw1.0/otp.bin.z77
 +File: ath6k/AR6003/hw1.0/bdata.SD31.bin
 +File: ath6k/AR6003/hw1.0/bdata.SD32.bin
 +File: ath6k/AR6003/hw1.0/data.patch.bin
 +File: ath6k/AR6003/hw1.0/bdata.WB31.bin
 +File: ath6k/AR6003/hw1.0/athwlan.bin.z77
 +File: ath6k/AR6003/hw2.1.1
 +File: ath6k/AR6003/hw2.1.1/otp.bin
 +File: ath6k/AR6003/hw2.1.1/athwlan.bin
 +File: ath6k/AR6003/hw2.1.1/endpointping.bin
 +File: ath6k/AR6003/hw2.1.1/bdata.SD31.bin
 +File: ath6k/AR6003/hw2.1.1/bdata.SD32.bin
 +File: ath6k/AR6003/hw2.1.1/data.patch.bin
 +File: ath6k/AR6003/hw2.1.1/bdata.WB31.bin
 +File: ath6k/AR6003/hw2.0
 +File: ath6k/AR6003/hw2.0/otp.bin.z77
 +File: ath6k/AR6003/hw2.0/bdata.SD31.bin
 +File: ath6k/AR6003/hw2.0/bdata.SD32.bin
 +File: ath6k/AR6003/hw2.0/data.patch.bin
 +File: ath6k/AR6003/hw2.0/bdata.WB31.bin
 +File: ath6k/AR6003/hw2.0/athwlan.bin.z77
 +File: ath6k/AR6002
 +File: ath6k/AR6002/eeprom.data
 +File: ath6k/AR6002/README.txt
 +File: ath6k/AR6002/License.txt
 +File: ath6k/AR6002/eeprom.bin
 +File: ath6k/AR6002/athwlan.bin.z77
 +File: ath6k/AR6002/data.patch.hw2_0.bin
 +
 +Licence: Redistributable. See LICENCE.atheros_firmware for details
 +
 +--------------------------------------------------------------------------
 +
 +Driver: myri10ge - Myri10GE 10GbE NIC driver
 +
 +File: myri10ge_eth_z8e.dat
 +File: myri10ge_ethp_z8e.dat
 +File: myri10ge_rss_eth_z8e.dat
 +File: myri10ge_rss_ethp_z8e.dat
 +Info: v1.4.52
 +
 +License: Redistributable.  See LICENCE.myri10ge_firmware for details.