From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 22 Jun 2012 18:36:10 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: firefly_0821_release~3680^2~2549^2~26
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4e42200cafe0c7a90fc26b82b2088c4f2bcb007a;p=firefly-linux-kernel-4.4.55.git

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

4e42200cafe0c7a90fc26b82b2088c4f2bcb007a