From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 31 Aug 2010 18:12:19 +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~7613^2~3670^2~265^2^2~192
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=486699532e43460234cbebc19cbebd2755b67da3;p=firefly-linux-kernel-4.4.55.git

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

486699532e43460234cbebc19cbebd2755b67da3