From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 26 Sep 2014 17:33:58 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif... 
X-Git-Tag: firefly_0821_release~176^2~3001^2~75^2~82
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d3d3e0017fcc2c3c8e5f6a229f4b65f8bcc15bae;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
---

d3d3e0017fcc2c3c8e5f6a229f4b65f8bcc15bae