]> git.proxmox.com Git - mirror_linux-firmware.git/commitdiff
Merge branch 'for-upstream' of git://git.chelsio.net/pub/git/linux-firmware
authorKyle McMartin <kyle@kernel.org>
Fri, 14 Aug 2015 17:22:17 +0000 (13:22 -0400)
committerKyle McMartin <kyle@kernel.org>
Fri, 14 Aug 2015 17:22:17 +0000 (13:22 -0400)
Signed-off-by: Kyle McMartin <kyle@kernel.org>

Trivial merge