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

author Josh Boyer <jwboyer@kernel.org>

Mon, 14 Jan 2019 15:29:15 +0000 (10:29 -0500)

committer Josh Boyer <jwboyer@kernel.org>

Mon, 14 Jan 2019 15:29:15 +0000 (10:29 -0500)
author Josh Boyer <jwboyer@kernel.org>
Mon, 14 Jan 2019 15:29:15 +0000 (10:29 -0500)
committer Josh Boyer <jwboyer@kernel.org>
Mon, 14 Jan 2019 15:29:15 +0000 (10:29 -0500)
diff --cc WHENCE
Simple merge
diff --cc mrvl/usb8801_uapsta.bin

index 29df7fd1fab1349ab5ee564c930daf23ae86d486,8a1b57fbb20d2997a536033c33b4652df117b1a3..8a1b57fbb20d2997a536033c33b4652df117b1a3

mode 100644,100755..100644

Binary files differ
author	Josh Boyer <jwboyer@kernel.org>
	Mon, 14 Jan 2019 15:29:15 +0000 (10:29 -0500)
committer	Josh Boyer <jwboyer@kernel.org>
	Mon, 14 Jan 2019 15:29:15 +0000 (10:29 -0500)
		1	2
WHENCE	patch \|	diff1 \|	diff2 \|	blob \| history
mrvl/usb8801_uapsta.bin	patch \|	diff1 \|	diff2 \|	blob \| history