From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 24 May 2011 20:47:54 +0000 (-0400)
Subject: Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6... 
X-Git-Tag: firefly_0821_release~7613^2~967^2~41^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=31ec97d9cebac804814de298592648f7c18d8281;p=firefly-linux-kernel-4.4.55.git

Merge ssh:///linux/kernel/git/linville/wireless-next-2.6 into for-davem
---

31ec97d9cebac804814de298592648f7c18d8281