From: Kyle McMartin <kyle@kernel.org>
Date: Mon, 9 Mar 2015 20:00:03 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux... 
X-Git-Tag: 20190312~585
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=020e534ec90106d42a890cd9d090b24e3d158c53;p=linux-firmware

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

020e534ec90106d42a890cd9d090b24e3d158c53