From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Fri, 9 Mar 2012 19:37:55 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: firefly_0821_release~3680^2~2787^2~410^2~58^2~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9c93ac87d736814b8b6dfe4dae3ea6474a21fce3;p=firefly-linux-kernel-4.4.55.git

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

9c93ac87d736814b8b6dfe4dae3ea6474a21fce3