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

author Josh Boyer <jwboyer@kernel.org>

Tue, 12 Mar 2019 12:03:54 +0000 (08:03 -0400)

committer Josh Boyer <jwboyer@kernel.org>

Tue, 12 Mar 2019 12:03:54 +0000 (08:03 -0400)
author Josh Boyer <jwboyer@kernel.org>
Tue, 12 Mar 2019 12:03:54 +0000 (08:03 -0400)
committer Josh Boyer <jwboyer@kernel.org>
Tue, 12 Mar 2019 12:03:54 +0000 (08:03 -0400)
diff --cc WHENCE
Simple merge
diff --cc mrvl/pcie8997_wlan_v4.bin

index a551bad480774a8b80b6e93622239d88b8489ed5,eec7465d5ae26dc059737868bb10f0ca2574a8b8..eec7465d5ae26dc059737868bb10f0ca2574a8b8

mode 100644,100755..100644

Binary files differ
diff --cc mrvl/sd8801_uapsta.bin

index 1923495dae4513311958be703ba93948afcc5357,78c5db3bb9a41eec7556433398dfd8cb7c1406b7..78c5db3bb9a41eec7556433398dfd8cb7c1406b7

mode 100644,100755..100644

Binary files differ
diff --cc mrvl/sd8887_uapsta.bin

index 8a29cd0ced7438f710a408374037120e3693c717,60ac4946a69d4004492452965916468f6cf21305..60ac4946a69d4004492452965916468f6cf21305

mode 100644,100755..100644

Binary files differ
author	Josh Boyer <jwboyer@kernel.org>
	Tue, 12 Mar 2019 12:03:54 +0000 (08:03 -0400)
committer	Josh Boyer <jwboyer@kernel.org>
	Tue, 12 Mar 2019 12:03:54 +0000 (08:03 -0400)
		1	2
WHENCE	patch \|	diff1 \|	diff2 \|	blob \| history
mrvl/pcie8997_wlan_v4.bin	patch \|	diff1 \|	diff2 \|	blob \| history
mrvl/sd8801_uapsta.bin	patch \|	diff1 \|	diff2 \|	blob \| history
mrvl/sd8887_uapsta.bin	patch \|	diff1 \|	diff2 \|	blob \| history