From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 3 Jun 2011 18:31:50 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: firefly_0821_release~7613^2~967^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7b29dc21ea084be7ddfb536994a9cfae95337690;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6 into for-davem
---

7b29dc21ea084be7ddfb536994a9cfae95337690