From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 16 Aug 2010 18:40:44 +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~3670^2~679^2~99
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9714d315d28aef77a097fe905b25cc273c3d72ad;p=firefly-linux-kernel-4.4.55.git

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

9714d315d28aef77a097fe905b25cc273c3d72ad