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

author Kyle McMartin <kyle@kernel.org>

Sun, 10 Jan 2016 20:09:51 +0000 (12:09 -0800)

committer Kyle McMartin <kyle@kernel.org>

Sun, 10 Jan 2016 20:10:11 +0000 (12:10 -0800)
author Kyle McMartin <kyle@kernel.org>
Sun, 10 Jan 2016 20:09:51 +0000 (12:09 -0800)
committer Kyle McMartin <kyle@kernel.org>
Sun, 10 Jan 2016 20:10:11 +0000 (12:10 -0800)
diff --cc WHENCE
Simple merge
diff --cc mrvl/sd8801_uapsta.bin

index 0000000000000000000000000000000000000000,1923495dae4513311958be703ba93948afcc5357..1923495dae4513311958be703ba93948afcc5357

mode 000000,100755..100644

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

index 0000000000000000000000000000000000000000,c7b2d64eebd750d0612c892005d9ebc4856a9767..c7b2d64eebd750d0612c892005d9ebc4856a9767

mode 000000,100755..100644

Binary files differ
author	Kyle McMartin <kyle@kernel.org>
	Sun, 10 Jan 2016 20:09:51 +0000 (12:09 -0800)
committer	Kyle McMartin <kyle@kernel.org>
	Sun, 10 Jan 2016 20:10:11 +0000 (12:10 -0800)
		1	2
WHENCE	patch \|	diff1 \|	diff2 \|	blob \| history
mrvl/sd8801_uapsta.bin	patch \|	\|	diff2 \|	blob \| history
mrvl/usb8801_uapsta.bin	patch \|	\|	diff2 \|	blob \| history