From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 10 Jun 2013 18:51:17 +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~5703^2~103^2^2~5
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=76015021aaaa288bb4dc870258e0acc4d178c950;p=firefly-linux-kernel-4.4.55.git

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

76015021aaaa288bb4dc870258e0acc4d178c950