From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 27 Jun 2011 18:26:04 +0000 (-0400)
Subject: Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: firefly_0821_release~3680^2~5062^2~3^2^2~15
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ed9ed3b82b12ac70aaa654ef32ebf393ec3179e0;p=firefly-linux-kernel-4.4.55.git

Merge branch 'wireless-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6
---

ed9ed3b82b12ac70aaa654ef32ebf393ec3179e0