diff options
| author | Kyle McMartin <kyle@kernel.org> | 2017-03-14 08:57:31 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@kernel.org> | 2017-03-14 08:58:33 -0400 |
| commit | e39f0e3e6897ad865b3704f61218ae83f98a85da (patch) | |
| tree | 56b1c271c35c9803ef135b36419b8d92bf69f0b5 | |
| parent | 695f2d6d82173f4e322d8f834c9849775778022a (diff) | |
| parent | 59d72586fbaa71cdf3a9f0e0ea2bb169f80d9e6b (diff) | |
| download | firmware-e39f0e3e6897ad865b3704f61218ae83f98a85da.tar.gz | |
Merge git://git.marvell.com/mwifiex-firmware
[Also fix up the permissions on pcie8997_wlan_v4.bin]
| -rw-r--r-- | WHENCE | 7 | ||||
| -rw-r--r-- | mrvl/pcie8997_wlan_v4.bin | bin | 0 -> 428788 bytes | |||
| -rw-r--r-- | mrvl/pcieusb8997_combo_v4.bin | bin | 589048 -> 597136 bytes | |||
| -rw-r--r-- | mrvl/sd8897_uapsta.bin | bin | 802164 -> 800344 bytes |
4 files changed, 5 insertions, 2 deletions
@@ -742,7 +742,7 @@ File: mrvl/usb8797_uapsta.bin Version: 14.68.29.p49 File: mrvl/sd8897_uapsta.bin -Version: 15.68.7.p77 +Version: 15.68.7.p87 File: mrvl/usb8897_uapsta.bin Version: 15.68.4.p103 @@ -763,7 +763,10 @@ File: mrvl/pcieuart8997_combo_v4.bin Version: 16.68.1.p70 File: mrvl/pcieusb8997_combo_v4.bin -Version: 16.68.1.p70 +Version: 16.68.1.p97 + +File: mrvl/pcie8997_wlan_v4.bin +Version: 16.68.1.p97 Licence: Redistributable. See LICENCE.Marvell for details. Originates from http://git.marvell.com/?p=mwifiex-firmware.git diff --git a/mrvl/pcie8997_wlan_v4.bin b/mrvl/pcie8997_wlan_v4.bin Binary files differnew file mode 100644 index 00000000..a551bad4 --- /dev/null +++ b/mrvl/pcie8997_wlan_v4.bin diff --git a/mrvl/pcieusb8997_combo_v4.bin b/mrvl/pcieusb8997_combo_v4.bin Binary files differindex 5f5731f4..adc8f925 100644 --- a/mrvl/pcieusb8997_combo_v4.bin +++ b/mrvl/pcieusb8997_combo_v4.bin diff --git a/mrvl/sd8897_uapsta.bin b/mrvl/sd8897_uapsta.bin Binary files differindex 0edfde11..0dd780f3 100644 --- a/mrvl/sd8897_uapsta.bin +++ b/mrvl/sd8897_uapsta.bin |