From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 28 May 2013 17:38:53 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: firefly_0821_release~3680^2~254^2~34^2~34
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d61bdbf1235b7a11b29197b538bbee41855eaf38;p=firefly-linux-kernel-4.4.55.git

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

d61bdbf1235b7a11b29197b538bbee41855eaf38