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

author Kyle McMartin <kyle@kernel.org>

Tue, 14 Mar 2017 12:57:31 +0000 (08:57 -0400)

committer Kyle McMartin <kyle@kernel.org>

Tue, 14 Mar 2017 12:58:33 +0000 (08:58 -0400)
author Kyle McMartin <kyle@kernel.org>
Tue, 14 Mar 2017 12:57:31 +0000 (08:57 -0400)
committer Kyle McMartin <kyle@kernel.org>
Tue, 14 Mar 2017 12:58:33 +0000 (08:58 -0400)
diff --cc WHENCE
Simple merge
diff --cc mrvl/pcie8997_wlan_v4.bin

index 0000000000000000000000000000000000000000,a551bad480774a8b80b6e93622239d88b8489ed5..a551bad480774a8b80b6e93622239d88b8489ed5

mode 000000,100755..100644

Binary files differ
author	Kyle McMartin <kyle@kernel.org>
	Tue, 14 Mar 2017 12:57:31 +0000 (08:57 -0400)
committer	Kyle McMartin <kyle@kernel.org>
	Tue, 14 Mar 2017 12:58:33 +0000 (08:58 -0400)
		1	2
WHENCE	patch \|	diff1 \|	diff2 \|	blob \| history
mrvl/pcie8997_wlan_v4.bin	patch \|	\|	diff2 \|	blob \| history