From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 28 Feb 2014 18:42:02 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif... 
X-Git-Tag: firefly_0821_release~176^2~4262^2~21^2^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5e038890b60c34267c99528f3cb0fc4d6c75d89d;p=firefly-linux-kernel-4.4.55.git

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

5e038890b60c34267c99528f3cb0fc4d6c75d89d