]> git.proxmox.com Git - mirror_linux-firmware.git/commitdiff
Merge branch 'marvell-mwifiex'
authorKyle McMartin <kyle@kernel.org>
Tue, 27 Jan 2015 15:38:03 +0000 (10:38 -0500)
committerKyle McMartin <kyle@kernel.org>
Tue, 27 Jan 2015 15:42:47 +0000 (10:42 -0500)
Signed-off-by: Kyle McMartin <kyle@kernel.org>

Trivial merge