From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 6 Apr 2010 20:37:10 +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~374
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a124f3bed79d5fd5f87b09a7569ae6b7da4171d2;p=firefly-linux-kernel-4.4.55.git

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

a124f3bed79d5fd5f87b09a7569ae6b7da4171d2