From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 19 Apr 2010 20:37:59 +0000 (-0400)
Subject: Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~9833^2~2087^2~167^2~166
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=76026660c3699a82d1df2d04f6dd81af01d9d19a;p=firefly-linux-kernel-4.4.55.git

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

76026660c3699a82d1df2d04f6dd81af01d9d19a