From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 7 Jul 2014 18:59:57 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: firefly_0821_release~176^2~3540^2~11^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1b2388d03f871faec084666fe71acc770fad5160;p=firefly-linux-kernel-4.4.55.git

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

1b2388d03f871faec084666fe71acc770fad5160