From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 20 Jun 2011 19:28:44 +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~3680^2~4429^2~12^2~42^2~401
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6392cb387cb629a5aa488e6a2eab9383b574a7ef;p=firefly-linux-kernel-4.4.55.git

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

6392cb387cb629a5aa488e6a2eab9383b574a7ef