From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 29 Jul 2013 18:43:37 +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~5487^2~25^2^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=718803d161936cf347a21a5a1df29c11fbd4978d;p=firefly-linux-kernel-4.4.55.git

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

718803d161936cf347a21a5a1df29c11fbd4978d