From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 6 Feb 2014 19:34:31 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: firefly_0821_release~176^2~4262^2~21^2^2~35
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=199160bbc9271b9351c062a477699fea72b29e3a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211
---

199160bbc9271b9351c062a477699fea72b29e3a