Merge git://git.marvell.com/mwifiex-firmware

Signed-off-by: Josh Boyer <jwboyer@kernel.org>

diff --git a/WHENCE b/WHENCE
index 21a8f56f8ceef1558d4ac3162c37b999cb339b2c..d5e031319334a505eaa0c69cb06f1e591f649e17 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -738,7 +738,7 @@ directly by Marvell.
 Driver: mwifiex - Marvell Wi-Fi fullmac-type 802.11n/ac cards
 
 File: mrvl/sd8787_uapsta.bin
-Version: 14.66.35.p52
+Version: W14.68.35.p66
 
 File: mrvl/usb8766_uapsta.bin
 Version: 14.68.22.p16
@@ -756,13 +756,13 @@ File: mrvl/usb8897_uapsta.bin
 Version: 15.68.4.p103
 
 File: mrvl/pcie8897_uapsta.bin
-Version: V15.68.7.p154
+Version: W15.68.19.p21
 
 File: mrvl/sd8887_uapsta.bin
-Version: 15.68.7.p112
+Version: W15.68.7.p189
 
 File: mrvl/sd8801_uapsta.bin
-Version: 14.68.36.p60
+Version: W14.68.36.p204
 
 File: mrvl/usb8801_uapsta.bin
 Version: W14.68.36.p138
@@ -774,10 +774,10 @@ File: mrvl/pcieusb8997_combo_v4.bin
 Version: W16.68.1.p195
 
 File: mrvl/pcie8997_wlan_v4.bin
-Version: 16.68.1.p97
+Version: W16.68.1.p195
 
 File: mrvl/usbusb8997_combo_v4.bin
-Version: V16.68.1.p162
+Version: W16.68.1.p183
 
 File: mrvl/sdsd8997_combo_v4.bin
 Version: W16.68.1.p179

diff --git a/mrvl/pcie8897_uapsta.bin b/mrvl/pcie8897_uapsta.bin
index 0f5afdd5b4a8d9fae6d2bfbc9592d672aeda1a0f..8a76aea4a720f81be56d7f3d87dad6d0b6b424bb 100644 (file)
Binary files a/mrvl/pcie8897_uapsta.bin and b/mrvl/pcie8897_uapsta.bin differ

diff --git a/mrvl/pcie8997_wlan_v4.bin b/mrvl/pcie8997_wlan_v4.bin
index a551bad480774a8b80b6e93622239d88b8489ed5..eec7465d5ae26dc059737868bb10f0ca2574a8b8 100644 (file)
Binary files a/mrvl/pcie8997_wlan_v4.bin and b/mrvl/pcie8997_wlan_v4.bin differ

diff --git a/mrvl/sd8787_uapsta.bin b/mrvl/sd8787_uapsta.bin
index 88a4ed035998767635c03680bcb039e5503deb7b..5d86040527c597c822918c797839fdf514777f43 100644 (file)
Binary files a/mrvl/sd8787_uapsta.bin and b/mrvl/sd8787_uapsta.bin differ

diff --git a/mrvl/sd8801_uapsta.bin b/mrvl/sd8801_uapsta.bin
index 1923495dae4513311958be703ba93948afcc5357..78c5db3bb9a41eec7556433398dfd8cb7c1406b7 100644 (file)
Binary files a/mrvl/sd8801_uapsta.bin and b/mrvl/sd8801_uapsta.bin differ

diff --git a/mrvl/sd8887_uapsta.bin b/mrvl/sd8887_uapsta.bin
index 8a29cd0ced7438f710a408374037120e3693c717..60ac4946a69d4004492452965916468f6cf21305 100644 (file)
Binary files a/mrvl/sd8887_uapsta.bin and b/mrvl/sd8887_uapsta.bin differ

diff --git a/mrvl/usbusb8997_combo_v4.bin b/mrvl/usbusb8997_combo_v4.bin
index 5b697ceda5c70b9ad4e100e9899d59c05d89ec2b..b0e5e9c009f205bfcf4ec153b5fe318410f39f19 100644 (file)
Binary files a/mrvl/usbusb8997_combo_v4.bin and b/mrvl/usbusb8997_combo_v4.bin differ