From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 22 Nov 2010 20:28:30 +0000 (-0500)
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~3122^2~169^2^2~225
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=840fd8ff64f7b6c9cbfa9b7d0419f015f33303ff;p=firefly-linux-kernel-4.4.55.git

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

840fd8ff64f7b6c9cbfa9b7d0419f015f33303ff