Merge branch 'master' of git://git.marvell.com/mwifiex-firmware

author Kyle McMartin <kyle@kernel.org>

Sat, 22 Apr 2017 18:25:59 +0000 (11:25 -0700)

committer Kyle McMartin <kyle@kernel.org>

Sat, 22 Apr 2017 18:25:59 +0000 (11:25 -0700)
author Kyle McMartin <kyle@kernel.org>
Sat, 22 Apr 2017 18:25:59 +0000 (11:25 -0700)
committer Kyle McMartin <kyle@kernel.org>
Sat, 22 Apr 2017 18:25:59 +0000 (11:25 -0700)
diff --cc WHENCE
Simple merge
diff --cc mrvl/sd8887_uapsta.bin

index 165e6c3d34b0c2a630252907a7ac4daf6e13c9d5,8a29cd0ced7438f710a408374037120e3693c717..8a29cd0ced7438f710a408374037120e3693c717

mode 100644,100755..100644

Binary files differ
author	Kyle McMartin <kyle@kernel.org>
	Sat, 22 Apr 2017 18:25:59 +0000 (11:25 -0700)
committer	Kyle McMartin <kyle@kernel.org>
	Sat, 22 Apr 2017 18:25:59 +0000 (11:25 -0700)
		1	2
WHENCE	patch \|	diff1 \|	diff2 \|	blob \| history
mrvl/sd8887_uapsta.bin	patch \|	diff1 \|	diff2 \|	blob \| history