Merge branch 'wilink4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/linux...

diff --combined WHENCE
index 8abbac8,3a35670..2d52804
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -1694,12 -1694,9 +1694,12 @@@ Driver: brcmfmac - Broadcom 802.11n ful
  
  File: brcm/bcm4329-fullmac-4.bin
  File: brcm/brcmfmac43236b.bin
 -File: brcm/brcmfmac4329.bin
 -File: brcm/brcmfmac4330.bin
 -File: brcm/brcmfmac4334.bin
 +File: brcm/brcmfmac4329-sdio.bin
 +File: brcm/brcmfmac4330-sdio.bin
 +File: brcm/brcmfmac4334-sdio.bin
 +File: brcm/brcmfmac4335-sdio.bin
 +File: brcm/brcmfmac43241b0-sdio.bin
 +File: brcm/brcmfmac43241b4-sdio.bin
  
  Licence: Redistributable. See LICENCE.broadcom_bcm43xx for details.
  
@@@ -1715,6 -1712,24 +1715,24 @@@ Licence: Redistributable. See LICENCE.t
  
  --------------------------------------------------------------------------
  
+ Driver: wl1251 - Texas Instruments 802.11 WLAN driver for WiLink4 chips
+ 
+ File: ti-connectivity/wl1251-fw.bin
+ Version: 4.0.4.3.7
+ 
+ File: ti-connectivity/wl1251-nvs.bin
+ 
+ Licence: See LICENCE.wl1251 for details.
+ 
+ The published NVS files are for testing only.  Every device needs to
+ have a unique NVS which is properly calibrated for best results.
+ 
+ The driver expects to find the firmwares under a ti-connectivity subdirectory.
+ So if your system looks for firmwares in /lib/firmware, the firmwares for
+ wl12xx chips must be located in /lib/firmware/ti-connectivity/.
+ 
+ --------------------------------------------------------------------------
+ 
  Driver: wl12xx - Texas Instruments 802.11 WLAN driver for WiLink6/7 chips
  
  File: ti-connectivity/wl1271-fw.bin
@@@ -1858,9 -1873,6 +1876,9 @@@ Licence: Redistributable. See LICENCE.r
  Driver: rtl8192cu - Realtek 802.11n WLAN driver for RTL8192CU
  
  File: rtlwifi/rtl8192cufw.bin
 +FILE: rtlwifi/rtl8192cufw_A.bin
 +FILE: rtlwifi/rtl8192cufw_B.bin
 +FILE: rtlwifi/rtl8192cufw_TMSC.bin
  
  Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details.
  
@@@ -1900,15 -1912,6 +1918,15 @@@ Info: Taken from Realtek version rtl_92
  File: rtlwifi/rtl8188efw.bin
  
  Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: rtl8188eu - Realtek 802.11n WLAN driver for RTL8188EU
 +
 +Info: Taken from Realtek version RTL8188EUS_linux_v4.1.4_6773.20130222
 +File: rtlwifi/rtl8188eufw.bin
 +
 +Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details.
  
  --------------------------------------------------------------------------