From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 8 Mar 2013 20:53:47 +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~478^2~21^2^2~305
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cd309ab39351cfd5d0a310bd3d0eb76d0b31f66d;p=firefly-linux-kernel-4.4.55.git

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

cd309ab39351cfd5d0a310bd3d0eb76d0b31f66d