From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 28 May 2013 17:39:40 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: firefly_0821_release~3680^2~254^2~34^2~33
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=25da0cd4233dbc3dbf8adbd7a357d00a9e796f40;p=firefly-linux-kernel-4.4.55.git

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

25da0cd4233dbc3dbf8adbd7a357d00a9e796f40