tree 049879af958ffb57923972c9773a7e55d0805a4c
parent 8d36e0b4ecd435b5dfb5ed55f1bc22195aeb5684
parent 2d4aa2037a7015c4d78cde40006f80b8012537a6
author Avery Pennarun <apenwarr@gmail.com> 1390559586 -0500
committer Avery Pennarun <apenwarr@gmail.com> 1390559590 -0500

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

* 'master' of git://git.marvell.com/mwifiex-firmware:
  linux-firmware: add Marvell USB8897-B0 firmware combo image
  linux-firmware: update Marvell SD8897-B0 firmware combo image
  linux-firmware: update Marvell USB8797-B0 firmware image

Change-Id: I0e46445874bab35401128dcde3b643e5e3322052