From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 25 Apr 2011 18:42:51 +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~967^2~16^2~328
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=534f0e29282a007a589a659d31baa1ef828c22da;p=firefly-linux-kernel-4.4.55.git

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

534f0e29282a007a589a659d31baa1ef828c22da