From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 26 Nov 2012 19:25:22 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: firefly_0821_release~3680^2~1560^2~2^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=53c5251366e7b815f76f92260b594446c94bd534;p=firefly-linux-kernel-4.4.55.git

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

53c5251366e7b815f76f92260b594446c94bd534