tree 33cd358e255ca6bf8fd93d8d3dd4d5d5232659c6
parent 6ac39630f81c5c4ec3f73ce62caa0aa9eda43629
parent c1041d5e88555287a731c0547e3b368fe0316cf8
author Petri Gynther <pgynther@google.com> 1397536839 -0700
committer Petri Gynther <pgynther@google.com> 1397536839 -0700

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

Conflicts:
	WHENCE
	mrvl/sd8897_uapsta.bin
	mrvl/usb8897_uapsta.bin

Conflicts resolved with:
git checkout --theirs WHENCE
git checkout --theirs mrvl/sd8897_uapsta.bin
git checkout --theirs mrvl/usb8897_uapsta.bin

Change-Id: Ie20ea5a3e01c41495fade64325f3b0e07707d385