From: Kyle McMartin <kyle@kernel.org>
Date: Tue, 14 Mar 2017 12:57:31 +0000 (-0400)
Subject: Merge git://git.marvell.com/mwifiex-firmware
X-Git-Tag: 20190312~311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e39f0e3e6897ad865b3704f61218ae83f98a85da;p=linux-firmware

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

[Also fix up the permissions on pcie8997_wlan_v4.bin]
---

e39f0e3e6897ad865b3704f61218ae83f98a85da
diff --cc mrvl/pcie8997_wlan_v4.bin
index 0000000,a551bad..a551bad
mode 000000,100755..100644
Binary files differ