Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/egrumbach...

diff --git a/WHENCE b/WHENCE
index b93476fd369cafbcc4126e3f9937ffcf76ed5fdb..ca0f30bb68ee075c3f3578c7e69a2f9036613100 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -1131,6 +1131,9 @@ File: bnx2x/bnx2x-e2-7.8.2.0.fw
 File: bnx2x/bnx2x-e1-7.8.17.0.fw
 File: bnx2x/bnx2x-e1h-7.8.17.0.fw
 File: bnx2x/bnx2x-e2-7.8.17.0.fw
+File: bnx2x/bnx2x-e1-7.8.19.0.fw
+File: bnx2x/bnx2x-e1h-7.8.19.0.fw
+File: bnx2x/bnx2x-e2-7.8.19.0.fw
 
 License:
   Copyright (c) 2007-2011 Broadcom Corporation
@@ -1717,6 +1720,7 @@ File: brcm/brcmfmac4329-sdio.bin
 File: brcm/brcmfmac4330-sdio.bin
 File: brcm/brcmfmac4334-sdio.bin
 File: brcm/brcmfmac4335-sdio.bin
+File: brcm/brcmfmac43362-sdio.bin
 File: brcm/brcmfmac43241b0-sdio.bin
 File: brcm/brcmfmac43241b4-sdio.bin
 
@@ -1832,6 +1836,8 @@ File: ti-connectivity/wl18xx-fw.bin
 Version: 8.2.0.0.100
 File: ti-connectivity/wl18xx-fw-2.bin
 Version: 8.5.0.0.55
+File: ti-connectivity/wl18xx-fw-3.bin
+Version: 8.8.0.0.13
 File: ti-connectivity/wl18xx-conf.bin
 Version: 6/5
 
@@ -1895,9 +1901,9 @@ Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details.
 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
+File: rtlwifi/rtl8192cufw_A.bin
+File: rtlwifi/rtl8192cufw_B.bin
+File: rtlwifi/rtl8192cufw_TMSC.bin
 
 Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details.
 
@@ -1971,6 +1977,15 @@ Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details.
 
 --------------------------------------------------------------------------
 
+Driver: rtl8192ee - Realtek 802.11n WLAN driver for RTL8192EE
+
+Info: Taken from Realtek version rtl_92ce_92se_92de_8723ae_88ee_8723be_92ee_linux_mac80211_0017.1224.2013
+File: rtlwifi/rtl8192eefw.bin
+
+Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details.
+
+--------------------------------------------------------------------------
+
 Driver: r8169 - RealTek 8169/8168/8101 ethernet driver.
 
 File: rtl_nic/rtl8168d-1.fw
@@ -2110,7 +2125,11 @@ File: myri10ge_eth_z8e.dat
 File: myri10ge_ethp_z8e.dat
 File: myri10ge_rss_eth_z8e.dat
 File: myri10ge_rss_ethp_z8e.dat
-Version: 1.4.52
+File: myri10ge_eth_big_z8e.dat
+File: myri10ge_ethp_big_z8e.dat
+File: myri10ge_rss_eth_big_z8e.dat
+File: myri10ge_rss_ethp_big_z8e.dat
+Version: 1.4.57
 
 License: Redistributable.  See LICENCE.myri10ge_firmware for details.
 
@@ -2367,11 +2386,11 @@ License:
 Driver: BFA/BNA - Brocade Adapter FC/FCOE drivers
 
 File: cbfw-3.2.1.1.bin
-FIle: ctfw-3.2.1.1.bin
-FIle: ct2fw-3.2.1.1.bin
+File: ctfw-3.2.1.1.bin
+File: ct2fw-3.2.1.1.bin
 File: cbfw-3.2.3.0.bin
-FIle: ctfw-3.2.3.0.bin
-FIle: ct2fw-3.2.3.0.bin
+File: ctfw-3.2.3.0.bin
+File: ct2fw-3.2.3.0.bin
 
 Licence:
 

diff --git a/bnx2x/bnx2x-e1-7.8.19.0.fw b/bnx2x/bnx2x-e1-7.8.19.0.fw
new file mode 100644 (file)
index 0000000..fd1fbbb
Binary files /dev/null and b/bnx2x/bnx2x-e1-7.8.19.0.fw differ

diff --git a/bnx2x/bnx2x-e1h-7.8.19.0.fw b/bnx2x/bnx2x-e1h-7.8.19.0.fw
new file mode 100644 (file)
index 0000000..7d63337
Binary files /dev/null and b/bnx2x/bnx2x-e1h-7.8.19.0.fw differ

diff --git a/bnx2x/bnx2x-e2-7.8.19.0.fw b/bnx2x/bnx2x-e2-7.8.19.0.fw
new file mode 100644 (file)
index 0000000..248e5b7
Binary files /dev/null and b/bnx2x/bnx2x-e2-7.8.19.0.fw differ

diff --git a/brcm/brcmfmac43362-sdio.bin b/brcm/brcmfmac43362-sdio.bin
new file mode 100644 (file)
index 0000000..c11dfb2
Binary files /dev/null and b/brcm/brcmfmac43362-sdio.bin differ

diff --git a/myri10ge_eth_big_z8e.dat b/myri10ge_eth_big_z8e.dat
new file mode 100644 (file)
index 0000000..288030e
Binary files /dev/null and b/myri10ge_eth_big_z8e.dat differ

diff --git a/myri10ge_eth_z8e.dat b/myri10ge_eth_z8e.dat
index 0e6c3db82ad1483e106a42eccac5475b54c5ab8a..92f54a3c266dd237168287f70dff008effaa7aac 100644 (file)
Binary files a/myri10ge_eth_z8e.dat and b/myri10ge_eth_z8e.dat differ

diff --git a/myri10ge_ethp_big_z8e.dat b/myri10ge_ethp_big_z8e.dat
new file mode 100644 (file)
index 0000000..24d122d
Binary files /dev/null and b/myri10ge_ethp_big_z8e.dat differ

diff --git a/myri10ge_ethp_z8e.dat b/myri10ge_ethp_z8e.dat
index 43f49d3d96f3cadb4de9e129abba6a99a8897ae8..5b462c782f5890e4d60037aa266b78d3567bd510 100644 (file)
Binary files a/myri10ge_ethp_z8e.dat and b/myri10ge_ethp_z8e.dat differ

diff --git a/myri10ge_rss_eth_big_z8e.dat b/myri10ge_rss_eth_big_z8e.dat
new file mode 100644 (file)
index 0000000..588054f
Binary files /dev/null and b/myri10ge_rss_eth_big_z8e.dat differ

diff --git a/myri10ge_rss_eth_z8e.dat b/myri10ge_rss_eth_z8e.dat
index fb2aa74caf96011f786e7903a8a4cdb464bb5e8a..30110907a935e38f30e8a4507e9b488f3926e044 100644 (file)
Binary files a/myri10ge_rss_eth_z8e.dat and b/myri10ge_rss_eth_z8e.dat differ

diff --git a/myri10ge_rss_ethp_big_z8e.dat b/myri10ge_rss_ethp_big_z8e.dat
new file mode 100644 (file)
index 0000000..dce6440
Binary files /dev/null and b/myri10ge_rss_ethp_big_z8e.dat differ

diff --git a/myri10ge_rss_ethp_z8e.dat b/myri10ge_rss_ethp_z8e.dat
index 4617632ff011633b28be5c72c730b539f4d49fd7..15686d3b43b79d6c98dc5a219f2d92033e3b1f7b 100644 (file)
Binary files a/myri10ge_rss_ethp_z8e.dat and b/myri10ge_rss_ethp_z8e.dat differ

diff --git a/rtlwifi/rtl8192eefw.bin b/rtlwifi/rtl8192eefw.bin
new file mode 100644 (file)
index 0000000..bede1ad
Binary files /dev/null and b/rtlwifi/rtl8192eefw.bin differ

diff --git a/ti-connectivity/wl18xx-fw-3.bin b/ti-connectivity/wl18xx-fw-3.bin
new file mode 100644 (file)
index 0000000..3c799a3
Binary files /dev/null and b/ti-connectivity/wl18xx-fw-3.bin differ