aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@kernel.org>2018-01-19 07:02:29 -0500
committerJosh Boyer <jwboyer@kernel.org>2018-01-19 07:02:29 -0500
commite396bbedeabeeeb43e930ba1781ebc83f967c0e9 (patch)
tree93a0018f4ce654c9c9a371cb385f1ab9ad980e69
parent6ac6d57bdeb354a11b21a3ee5a00f6852cb57fea (diff)
parent5446916b53de395245d89400dea566055ec4502c (diff)
downloadfirmware-e396bbedeabeeeb43e930ba1781ebc83f967c0e9.tar.gz
Merge branch 'master' of git://git.marvell.com/mwifiex-firmware
Signed-off-by: Josh Boyer <jwboyer@kernel.org>
-rw-r--r--WHENCE4
-rw-r--r--mrvl/pcie8897_uapsta.binbin836540 -> 843828 bytes
-rw-r--r--mrvl/pcieusb8997_combo_v4.binbin622532 -> 631012 bytes
3 files changed, 2 insertions, 2 deletions
diff --git a/WHENCE b/WHENCE
index 1ef9a632..7c9c5f44 100644
--- a/WHENCE
+++ b/WHENCE
@@ -748,7 +748,7 @@ File: mrvl/usb8897_uapsta.bin
Version: 15.68.4.p103
File: mrvl/pcie8897_uapsta.bin
-Version: 15.68.7.p119
+Version: V15.68.7.p154
File: mrvl/sd8887_uapsta.bin
Version: 15.68.7.p112
@@ -763,7 +763,7 @@ File: mrvl/pcieuart8997_combo_v4.bin
Version: 16.68.1.p70
File: mrvl/pcieusb8997_combo_v4.bin
-Version: 16.68.1.p140
+Version: 16.68.1.p145
File: mrvl/pcie8997_wlan_v4.bin
Version: 16.68.1.p97
diff --git a/mrvl/pcie8897_uapsta.bin b/mrvl/pcie8897_uapsta.bin
index f91003b1..0f5afdd5 100644
--- a/mrvl/pcie8897_uapsta.bin
+++ b/mrvl/pcie8897_uapsta.bin
Binary files differ
diff --git a/mrvl/pcieusb8997_combo_v4.bin b/mrvl/pcieusb8997_combo_v4.bin
index 909733db..d260c450 100644
--- a/mrvl/pcieusb8997_combo_v4.bin
+++ b/mrvl/pcieusb8997_combo_v4.bin
Binary files differ