From: Kyle McMartin <kyle@kernel.org>
Date: Fri, 8 May 2015 16:36:30 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux... 
X-Git-Tag: 20190312~568
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15df7fb5a0b93ffe44c7ad34ee6676ef7f85a4d9;p=linux-firmware

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware
---

15df7fb5a0b93ffe44c7ad34ee6676ef7f85a4d9