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

author Josh Boyer <jwboyer@kernel.org>

Fri, 27 Jul 2018 15:03:47 +0000 (11:03 -0400)

committer Josh Boyer <jwboyer@kernel.org>

Fri, 27 Jul 2018 15:03:47 +0000 (11:03 -0400)
author Josh Boyer <jwboyer@kernel.org>
Fri, 27 Jul 2018 15:03:47 +0000 (11:03 -0400)
committer Josh Boyer <jwboyer@kernel.org>
Fri, 27 Jul 2018 15:03:47 +0000 (11:03 -0400)
diff --cc WHENCE
Simple merge
diff --cc mrvl/usb8801_uapsta.bin

index c7b2d64eebd750d0612c892005d9ebc4856a9767,29df7fd1fab1349ab5ee564c930daf23ae86d486..29df7fd1fab1349ab5ee564c930daf23ae86d486

mode 100644,100755..100644

Binary files differ
author	Josh Boyer <jwboyer@kernel.org>
	Fri, 27 Jul 2018 15:03:47 +0000 (11:03 -0400)
committer	Josh Boyer <jwboyer@kernel.org>
	Fri, 27 Jul 2018 15:03:47 +0000 (11:03 -0400)
		1	2
WHENCE	patch \|	diff1 \|	diff2 \|	blob \| history
mrvl/usb8801_uapsta.bin	patch \|	diff1 \|	diff2 \|	blob \| history