Merge branch 'master' of git://git.marvell.com/mwifiex-firmware
authorBen Hutchings <ben@decadent.org.uk>
Sun, 15 Dec 2013 17:46:33 +0000 (17:46 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 15 Dec 2013 17:46:33 +0000 (17:46 +0000)

Trivial merge