From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 27 Jun 2013 00:00:11 +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~5751^2~78^2^2~21
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=59731bb8c4f1536c5b698dc1aec82d7a5cef41eb;p=firefly-linux-kernel-4.4.55.git

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

59731bb8c4f1536c5b698dc1aec82d7a5cef41eb